Merge branch 'unix-compat' into develop

Conflicts:
	todo.txt

client/client_application.cpp

@@ -49,7 +49,7 @@ void ClientApplication::Init(int argc, char* argv[]) {
 
 	//load the prerequisites
 	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config.Load("rsc\\config.cfg", argc, argv);
+	config.Load("rsc/config.cfg", argc, argv);
 
 	//-------------------------
 	//Initialize the APIs

client/makefile

@@ -1,6 +1,15 @@
-#config
+#include directories
 INCLUDES+=. client_utilities renderable scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
-LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
+
+#libraries
+#the order of the $(LIBS) is important, at least for MinGW
+LIBS+=client.a ../libcommon.a -lSDL_net
+ifeq ($(OS),Windows_NT)
+	LIBS+=-lwsock32 -liphlpapi -lmingw32
+endif
+LIBS+=-lSDLmain -lSDL
+
+#flags
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source

common/map/region_api.hpp

@@ -22,7 +22,11 @@
 #ifndef REGIONAPI_HPP_
 #define REGIONAPI_HPP_
 
+#ifdef __unix__
+#include "lua.hpp"
+#else
 #include "lua/lua.hpp"
+#endif
 
 #define TORTUGA_REGION_NAME "Region"
 LUAMOD_API int openRegionAPI(lua_State* L);

common/map/region_pager_api.hpp

@@ -22,7 +22,11 @@
 #ifndef REGIONPAGERAPI_HPP_
 #define REGIONPAGERAPI_HPP_
 
+#ifdef __unix__
+#include "lua.hpp"
+#else
 #include "lua/lua.hpp"
+#endif
 
 #define TORTUGA_REGION_PAGER_NAME "RegionPager"
 LUAMOD_API int openRegionPagerAPI(lua_State* L);

common/map/region_pager_lua.hpp

@@ -24,7 +24,11 @@
 
 #include "region_pager_base.hpp"
 
+#ifdef __unix__
+#include "lua.hpp"
+#else
 #include "lua/lua.hpp"
+#endif
 
 #include <string>
 

common/map/tile_sheet_api.hpp

@@ -22,7 +22,12 @@
 #ifndef TILESHEETAPI_HPP_
 #define TILESHEETAPI_HPP_
 
+#ifdef __unix__
+#include "lua.hpp"
+#else
 #include "lua/lua.hpp"
+#endif
+
 
 #define TORTUGA_TILE_SHEET_NAME "TileSheet"
 LUAMOD_API int openTileSheetAPI(lua_State* L);

server/accounts/account_manager.hpp

@@ -26,7 +26,11 @@
 #include "singleton.hpp"
 #include "manager_interface.hpp"
 
+#ifdef __unix__
+#include "sqlite3.h"
+#else
 #include "sqlite3/sqlite3.h"
+#endif
 
 #include <functional>
 #include <map>

server/characters/character_manager.cpp

@@ -21,7 +21,11 @@
 */
 #include "character_manager.hpp"
 
+#ifdef __unix__
+#include "sqlite3.h"
+#else
 #include "sqlite3/sqlite3.h"
+#endif
 
 #include <algorithm>
 #include <stdexcept>
@@ -282,4 +286,4 @@ sqlite3* CharacterManager::SetDatabase(sqlite3* db) {
 
 sqlite3* CharacterManager::GetDatabase() {
 	return database;
-}
+}

server/characters/character_manager.hpp

@@ -26,7 +26,11 @@
 #include "singleton.hpp"
 #include "manager_interface.hpp"
 
+#ifdef __unix__
+#include "sqlite3.h"
+#else
 #include "sqlite3/sqlite3.h"
+#endif
 
 #include <functional>
 #include <map>

server/linit.cpp

@@ -34,7 +34,11 @@
 #define linit_c
 #define LUA_LIB
 
+#ifdef __unix__
+#include "lua.hpp"
+#else
 #include "lua/lua.hpp"
+#endif
 
 #include "region_api.hpp"
 #include "region_pager_api.hpp"
@@ -86,4 +90,4 @@ LUALIB_API void luaL_openlibs (lua_State *L) {
 		lua_setfield(L, -2, lib->name);
 	}
 	lua_pop(L, 1); //remove _PRELOAD table
-}
+}

server/makefile

@@ -1,6 +1,15 @@
-#config
+#include directories
 INCLUDES+=. accounts characters rooms server_utilities ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
-LIBS+=server.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
+
+#libraries
+#the order of the $(LIBS) is important, at least for MinGW
+LIBS+=server.a ../libcommon.a -lSDL_net
+ifeq ($(OS),Windows_NT)
+	LIBS+=-lwsock32 -liphlpapi -lmingw32
+endif
+LIBS+=-lSDLmain -lSDL -llua -lsqlite3
+
+#flags
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source

server/rooms/room_api.hpp

@@ -22,7 +22,11 @@
 #ifndef ROOMAPI_HPP_
 #define ROOMAPI_HPP_
 
+#ifdef __unix__
+#include "lua.hpp"
+#else
 #include "lua/lua.hpp"
+#endif
 
 #define TORTUGA_ROOM_NAME "Room"
 LUAMOD_API int openRoomAPI(lua_State* L);

server/rooms/room_manager.hpp

@@ -26,7 +26,11 @@
 #include "singleton.hpp"
 #include "manager_interface.hpp"
 
+#ifdef __unix__
+#include "lua.hpp"
+#else
 #include "lua/lua.hpp"
+#endif
 
 class RoomManager:
 	public Singleton<RoomManager>,
@@ -63,4 +67,4 @@ private:
 	int counter = 0;
 };
 
-#endif
+#endif

server/rooms/room_manager_api.hpp

@@ -22,7 +22,11 @@
 #ifndef ROOMMANAGERAPI_HPP_
 #define ROOMMANAGERAPI_HPP_
 
+#ifdef __unix__
+#include "lua.hpp"
+#else
 #include "lua/lua.hpp"
+#endif
 
 #define TORTUGA_ROOM_MANAGER_NAME "RoomManager"
 LUAMOD_API int openRoomManagerAPI(lua_State* L);

server/server_application.hpp

@@ -35,8 +35,14 @@
 #include "singleton.hpp"
 
 //APIs
+#if __unix__
+#include "lua.hpp"
+#include "sqlite3.h"
+#else
 #include "lua/lua.hpp"
 #include "sqlite3/sqlite3.h"
+#endif
+
 #include "SDL/SDL.h"
 
 //STL

server/server_logic.cpp

@@ -40,7 +40,7 @@ void ServerApplication::Init(int argc, char* argv[]) {
 	std::cout << "Beginning " << argv[0] << std::endl;
 
 	//load the prerequisites
-	config.Load("rsc\\config.cfg", argc, argv);
+	config.Load("rsc/config.cfg", argc, argv);
 
 	//-------------------------
 	//Initialize the APIs
@@ -260,4 +260,4 @@ void ServerApplication::HandlePacket(SerialPacket* const argPacket) {
 		}
 		break;
 	}
-}
+}

server/server_utilities/sql_tools.hpp

@@ -22,7 +22,11 @@
 #ifndef SERVERUTILITY_HPP_
 #define SERVERUTILITY_HPP_
 
+#ifdef __unix__
+#include "sqlite3.h"
+#else
 #include "sqlite3/sqlite3.h"
+#endif
 
 #include <string>