diff --git a/client/client_application.cpp b/client/client_application.cpp index 3d287fc..2725314 100644 --- a/client/client_application.cpp +++ b/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 diff --git a/client/makefile b/client/makefile index ade60d1..39c104f 100644 --- a/client/makefile +++ b/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 diff --git a/common/map/region_api.hpp b/common/map/region_api.hpp index 6e6733f..749fb68 100644 --- a/common/map/region_api.hpp +++ b/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); diff --git a/common/map/region_pager_api.hpp b/common/map/region_pager_api.hpp index 3636c5a..f6cfe8d 100644 --- a/common/map/region_pager_api.hpp +++ b/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); diff --git a/common/map/region_pager_lua.hpp b/common/map/region_pager_lua.hpp index 3835b9c..8badec4 100644 --- a/common/map/region_pager_lua.hpp +++ b/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 diff --git a/common/map/tile_sheet_api.hpp b/common/map/tile_sheet_api.hpp index 0788535..33a563f 100644 --- a/common/map/tile_sheet_api.hpp +++ b/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); diff --git a/server/accounts/account_manager.hpp b/server/accounts/account_manager.hpp index e1bb576..7b0839a 100644 --- a/server/accounts/account_manager.hpp +++ b/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 #include diff --git a/server/characters/character_manager.cpp b/server/characters/character_manager.cpp index a9079b3..05aea38 100644 --- a/server/characters/character_manager.cpp +++ b/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 #include @@ -282,4 +286,4 @@ sqlite3* CharacterManager::SetDatabase(sqlite3* db) { sqlite3* CharacterManager::GetDatabase() { return database; -} \ No newline at end of file +} diff --git a/server/characters/character_manager.hpp b/server/characters/character_manager.hpp index d73cd42..8e54ede 100644 --- a/server/characters/character_manager.hpp +++ b/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 #include diff --git a/server/linit.cpp b/server/linit.cpp index 052f967..f2ffa13 100644 --- a/server/linit.cpp +++ b/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 -} \ No newline at end of file +} diff --git a/server/makefile b/server/makefile index c8c5ef2..b4a33a1 100644 --- a/server/makefile +++ b/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 diff --git a/server/rooms/room_api.hpp b/server/rooms/room_api.hpp index 5d2eab8..553506b 100644 --- a/server/rooms/room_api.hpp +++ b/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); diff --git a/server/rooms/room_manager.hpp b/server/rooms/room_manager.hpp index 5245d9c..093f902 100644 --- a/server/rooms/room_manager.hpp +++ b/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, @@ -63,4 +67,4 @@ private: int counter = 0; }; -#endif \ No newline at end of file +#endif diff --git a/server/rooms/room_manager_api.hpp b/server/rooms/room_manager_api.hpp index 529f5bd..7ded134 100644 --- a/server/rooms/room_manager_api.hpp +++ b/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); diff --git a/server/server_application.hpp b/server/server_application.hpp index 8e1b200..afb4f63 100644 --- a/server/server_application.hpp +++ b/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 diff --git a/server/server_logic.cpp b/server/server_logic.cpp index 6c85454..c83447b 100644 --- a/server/server_logic.cpp +++ b/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; } -} \ No newline at end of file +} diff --git a/server/server_utilities/sql_tools.hpp b/server/server_utilities/sql_tools.hpp index e791eaa..8251d29 100644 --- a/server/server_utilities/sql_tools.hpp +++ b/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