diff --git a/common/map/map_system_api.hpp b/common/map/map_system_api.hpp index d01c276..c188e18 100644 --- a/common/map/map_system_api.hpp +++ b/common/map/map_system_api.hpp @@ -22,11 +22,7 @@ #ifndef MAPSYSTEMAPI_HPP_ #define MAPSYSTEMAPI_APP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_MAP_SYSTEM_API "map_system" LUAMOD_API int openMapSystemAPI(lua_State* L); diff --git a/common/map/region_api.hpp b/common/map/region_api.hpp index aae8b29..cf3ef0e 100644 --- a/common/map/region_api.hpp +++ b/common/map/region_api.hpp @@ -22,11 +22,7 @@ #ifndef REGIONAPI_HPP_ #define REGIONAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #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 2476a95..01b01e8 100644 --- a/common/map/region_pager_api.hpp +++ b/common/map/region_pager_api.hpp @@ -22,11 +22,7 @@ #ifndef REGIONPAGERAPI_HPP_ #define REGIONPAGERAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_REGION_PAGER_NAME "region_pager" LUAMOD_API int openRegionPagerAPI(lua_State* L); diff --git a/common/map/region_pager_lua.hpp b/common/map/region_pager_lua.hpp index a4f5ba1..ea4e76b 100644 --- a/common/map/region_pager_lua.hpp +++ b/common/map/region_pager_lua.hpp @@ -24,11 +24,7 @@ #include "region_pager_base.hpp" -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #include #include diff --git a/common/map/tile_sheet_api.hpp b/common/map/tile_sheet_api.hpp index 3cdd0e5..57c812e 100644 --- a/common/map/tile_sheet_api.hpp +++ b/common/map/tile_sheet_api.hpp @@ -22,11 +22,7 @@ #ifndef TILESHEETAPI_HPP_ #define TILESHEETAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_TILE_SHEET_NAME "tile_sheet" LUAMOD_API int openTileSheetAPI(lua_State* L); diff --git a/server/accounts/account_manager.hpp b/server/accounts/account_manager.hpp index 629bc36..5481d13 100644 --- a/server/accounts/account_manager.hpp +++ b/server/accounts/account_manager.hpp @@ -25,11 +25,7 @@ #include "account_data.hpp" #include "singleton.hpp" -#if defined(__MINGW32__) - #include "sqlite3/sqlite3.h" -#else - #include "sqlite3.h" -#endif +#include "sqlite3.h" #include #include diff --git a/server/characters/character_api.hpp b/server/characters/character_api.hpp index 5ceda91..a7fe161 100644 --- a/server/characters/character_api.hpp +++ b/server/characters/character_api.hpp @@ -22,11 +22,7 @@ #ifndef CHARACTERAPI_HPP_ #define CHARACTERAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_CHARACTER_API "character" LUAMOD_API int openCharacterAPI(lua_State* L); diff --git a/server/characters/character_manager.cpp b/server/characters/character_manager.cpp index df8819f..2d7cf7c 100644 --- a/server/characters/character_manager.cpp +++ b/server/characters/character_manager.cpp @@ -21,11 +21,7 @@ */ #include "character_manager.hpp" -#if defined(__MINGW32__) - #include "sqlite3/sqlite3.h" -#else - #include "sqlite3.h" -#endif +#include "sqlite3.h" #include #include diff --git a/server/characters/character_manager.hpp b/server/characters/character_manager.hpp index 959dfbc..3a24c34 100644 --- a/server/characters/character_manager.hpp +++ b/server/characters/character_manager.hpp @@ -25,11 +25,7 @@ #include "character_data.hpp" #include "singleton.hpp" -#if defined(__MINGW32__) - #include "sqlite3/sqlite3.h" -#else - #include "sqlite3.h" -#endif +#include "sqlite3.h" #include #include diff --git a/server/characters/character_manager_api.hpp b/server/characters/character_manager_api.hpp index f4e52ed..7d643ef 100644 --- a/server/characters/character_manager_api.hpp +++ b/server/characters/character_manager_api.hpp @@ -22,11 +22,7 @@ #ifndef CHARACTERMANAGERAPI_HPP_ #define CHARACTERMANAGERAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_CHARACTER_MANAGER_API "character_manager" LUAMOD_API int openCharacterManagerAPI(lua_State* L); diff --git a/server/entities/entity_api.hpp b/server/entities/entity_api.hpp index 1e20cff..c08b5a1 100644 --- a/server/entities/entity_api.hpp +++ b/server/entities/entity_api.hpp @@ -22,11 +22,7 @@ #ifndef ENTITYAPI_HPP_ #define ENTITYAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_ENTITY_API "entity" LUAMOD_API int openEntityAPI(lua_State* L); diff --git a/server/linit.cpp b/server/linit.cpp index d4ab6e6..aaa449d 100644 --- a/server/linit.cpp +++ b/server/linit.cpp @@ -34,11 +34,7 @@ #define linit_c #define LUA_LIB -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #include "map_system_api.hpp" #include "room_system_api.hpp" diff --git a/server/monsters/monster_api.hpp b/server/monsters/monster_api.hpp index d0c52ef..e10c4a5 100644 --- a/server/monsters/monster_api.hpp +++ b/server/monsters/monster_api.hpp @@ -22,11 +22,7 @@ #ifndef MONSTERAPI_HPP_ #define MONSTERAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_MONSTER_API "monster" LUAMOD_API int openMonsterAPI(lua_State* L); diff --git a/server/monsters/monster_manager.hpp b/server/monsters/monster_manager.hpp index d8c7849..83e799a 100644 --- a/server/monsters/monster_manager.hpp +++ b/server/monsters/monster_manager.hpp @@ -25,13 +25,8 @@ #include "monster_data.hpp" #include "singleton.hpp" -#ifdef __unix__ - #include "lua.hpp" - #include "sqlite3.h" -#else - #include "lua/lua.hpp" - #include "sqlite3/sqlite3.h" -#endif +#include "lua.hpp" +#include "sqlite3.h" #include #include diff --git a/server/monsters/monster_manager_api.hpp b/server/monsters/monster_manager_api.hpp index d9eac7e..cc1b748 100644 --- a/server/monsters/monster_manager_api.hpp +++ b/server/monsters/monster_manager_api.hpp @@ -22,11 +22,7 @@ #ifndef MONSTERMANAGERAPI_HPP_ #define MONSTERMANAGERAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_MONSTER_MANAGER_API "monster_manager" LUAMOD_API int openMonsterManagerAPI(lua_State* L); diff --git a/server/rooms/room_api.hpp b/server/rooms/room_api.hpp index a091fd3..8e99d33 100644 --- a/server/rooms/room_api.hpp +++ b/server/rooms/room_api.hpp @@ -22,11 +22,7 @@ #ifndef ROOMAPI_HPP_ #define ROOMAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_ROOM_API "room" LUAMOD_API int openRoomAPI(lua_State* L); diff --git a/server/rooms/room_data.hpp b/server/rooms/room_data.hpp index eb977d2..8a8e094 100644 --- a/server/rooms/room_data.hpp +++ b/server/rooms/room_data.hpp @@ -25,11 +25,7 @@ #include "entity.hpp" #include "region_pager_lua.hpp" -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #include #include diff --git a/server/rooms/room_manager.hpp b/server/rooms/room_manager.hpp index 17d8e53..7fe75a6 100644 --- a/server/rooms/room_manager.hpp +++ b/server/rooms/room_manager.hpp @@ -26,11 +26,7 @@ #include "room_data.hpp" #include "singleton.hpp" -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #include #include diff --git a/server/rooms/room_manager_api.hpp b/server/rooms/room_manager_api.hpp index bbee066..645506c 100644 --- a/server/rooms/room_manager_api.hpp +++ b/server/rooms/room_manager_api.hpp @@ -22,11 +22,7 @@ #ifndef ROOMMANAGERAPI_HPP_ #define ROOMMANAGERAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_ROOM_MANAGER_API "room_manager" LUAMOD_API int openRoomManagerAPI(lua_State* L); diff --git a/server/rooms/room_system_api.hpp b/server/rooms/room_system_api.hpp index 7a8284a..29ec4d7 100644 --- a/server/rooms/room_system_api.hpp +++ b/server/rooms/room_system_api.hpp @@ -22,11 +22,7 @@ #ifndef ROOMSYSTEMAPI_HPP_ #define ROOMSYSTEMAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_ROOM_SYSTEM_API "room_system" LUAMOD_API int openRoomSystemAPI(lua_State* L); diff --git a/server/server_application.hpp b/server/server_application.hpp index 72d890c..f8c6d32 100644 --- a/server/server_application.hpp +++ b/server/server_application.hpp @@ -39,13 +39,8 @@ #include "singleton.hpp" //APIs -#if defined(__MINGW32__) - #include "lua/lua.hpp" - #include "sqlite3/sqlite3.h" -#else - #include "lua.hpp" - #include "sqlite3.h" -#endif +#include "lua.hpp" +#include "sqlite3.h" #include "SDL/SDL.h" diff --git a/server/server_utilities/sql_tools.hpp b/server/server_utilities/sql_tools.hpp index 6e019f8..ee13b08 100644 --- a/server/server_utilities/sql_tools.hpp +++ b/server/server_utilities/sql_tools.hpp @@ -22,11 +22,7 @@ #ifndef SERVERUTILITY_HPP_ #define SERVERUTILITY_HPP_ -#if defined(__MINGW32__) - #include "sqlite3/sqlite3.h" -#else - #include "sqlite3.h" -#endif +#include "sqlite3.h" #include diff --git a/server/waypoints/waypoint_api.hpp b/server/waypoints/waypoint_api.hpp index a3c49b9..3b07463 100644 --- a/server/waypoints/waypoint_api.hpp +++ b/server/waypoints/waypoint_api.hpp @@ -22,11 +22,7 @@ #ifndef WAYPOINTAPI_HPP_ #define WAYPOINTAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_WAYPOINT_API "waypoint" LUAMOD_API int openWaypointAPI(lua_State* L); diff --git a/server/waypoints/waypoint_data.hpp b/server/waypoints/waypoint_data.hpp index f58555c..b10faff 100644 --- a/server/waypoints/waypoint_data.hpp +++ b/server/waypoints/waypoint_data.hpp @@ -25,11 +25,7 @@ #include "bounding_box.hpp" #include "vector2.hpp" -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #include diff --git a/server/waypoints/waypoint_manager.hpp b/server/waypoints/waypoint_manager.hpp index bd1cc34..dfb3b5e 100644 --- a/server/waypoints/waypoint_manager.hpp +++ b/server/waypoints/waypoint_manager.hpp @@ -26,11 +26,7 @@ #include "singleton.hpp" #include "vector2.hpp" -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #include #include diff --git a/server/waypoints/waypoint_manager_api.hpp b/server/waypoints/waypoint_manager_api.hpp index f716ab4..7a7eb19 100644 --- a/server/waypoints/waypoint_manager_api.hpp +++ b/server/waypoints/waypoint_manager_api.hpp @@ -22,11 +22,7 @@ #ifndef WAYPOINTMANAGERAPI_HPP_ #define WAYPOINTMANAGERAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_WAYPOINT_MANAGER_API "waypoint_manager" LUAMOD_API int openWaypointManagerAPI(lua_State* L); diff --git a/server/waypoints/waypoint_system_api.hpp b/server/waypoints/waypoint_system_api.hpp index d651a1f..ffb748d 100644 --- a/server/waypoints/waypoint_system_api.hpp +++ b/server/waypoints/waypoint_system_api.hpp @@ -22,11 +22,7 @@ #ifndef WAYPOINTSYSTEMAPI_HPP_ #define WAYPOINTSYSTEMAPI_HPP_ -#if defined(__MINGW32__) - #include "lua/lua.hpp" -#else - #include "lua.hpp" -#endif +#include "lua.hpp" #define TORTUGA_WAYPOINT_SYSTEM_API "waypoint_system" LUAMOD_API int openWaypointSystemAPI(lua_State* L);