Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mingw-fix' into server-expansion

Browse Source
This commit is contained in:
Kayne Ruse
2014-11-05 23:55:38 +11:00
parent fc2bc06992 0f139562c3
commit 77b47b4634
14 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/map/region_api.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef REGIONAPI_HPP_ #ifndef REGIONAPI_HPP_
#define REGIONAPI_HPP_ #define REGIONAPI_HPP_
#ifdef __unix__ #if defined(__MINGW32__)
#include "lua.hpp" #include "lua/lua.hpp"
#else #else
#include "lua/lua.hpp" #include "lua.hpp"
#endif #endif
#define TORTUGA_REGION_NAME "Region" #define TORTUGA_REGION_NAME "Region"
common/map/region_pager_api.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef REGIONPAGERAPI_HPP_ #ifndef REGIONPAGERAPI_HPP_
#define REGIONPAGERAPI_HPP_ #define REGIONPAGERAPI_HPP_
#ifdef __unix__ #if defined(__MINGW32__)
#include "lua.hpp" #include "lua/lua.hpp"
#else #else
#include "lua/lua.hpp" #include "lua.hpp"
#endif #endif
#define TORTUGA_REGION_PAGER_NAME "RegionPager" #define TORTUGA_REGION_PAGER_NAME "RegionPager"
common/map/region_pager_lua.hpp
+3 -3
View File
@@ -24,10 +24,10 @@
#include "region_pager_base.hpp" #include "region_pager_base.hpp"
#ifdef __unix__ #if defined(__MINGW32__)
#include "lua.hpp" #include "lua/lua.hpp"
#else #else
#include "lua/lua.hpp" #include "lua.hpp"
#endif #endif
#include <string> #include <string>
common/map/tile_sheet_api.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef TILESHEETAPI_HPP_ #ifndef TILESHEETAPI_HPP_
#define TILESHEETAPI_HPP_ #define TILESHEETAPI_HPP_
#ifdef __unix__ #if defined(__MINGW32__)
#include "lua.hpp" #include "lua/lua.hpp"
#else #else
#include "lua/lua.hpp" #include "lua.hpp"
#endif #endif
common/utilities/utility.cpp
+1 -3
View File
@@ -29,10 +29,8 @@ std::string truncatePath(std::string pathname) {
pathname.rbegin(), pathname.rbegin(),
pathname.rend(), pathname.rend(),
[](char ch) -> bool { [](char ch) -> bool {
//windows only //windows & unix tested
return ch == '/' || ch == '\\'; return ch == '/' || ch == '\\';
// //unix only
// return ch == '/';
}).base(), }).base(),
pathname.end()); pathname.end());
} }
server/accounts/account_manager.hpp
+3 -3
View File
@@ -26,10 +26,10 @@
#include "singleton.hpp" #include "singleton.hpp"
#include "manager_interface.hpp" #include "manager_interface.hpp"
#ifdef __unix__ #if defined(__MINGW32__)
#include "sqlite3.h" #include "sqlite3/sqlite3.h"
#else #else
#include "sqlite3/sqlite3.h" #include "sqlite3.h"
#endif #endif
#include <functional> #include <functional>
server/characters/character_manager.cpp
+3 -3
View File
@@ -21,10 +21,10 @@
*/ */
#include "character_manager.hpp" #include "character_manager.hpp"
#ifdef __unix__ #if defined(__MINGW32__)
#include "sqlite3.h" #include "sqlite3/sqlite3.h"
#else #else
#include "sqlite3/sqlite3.h" #include "sqlite3.h"
#endif #endif
#include <algorithm> #include <algorithm>
server/characters/character_manager.hpp
+3 -3
View File
@@ -26,10 +26,10 @@
#include "singleton.hpp" #include "singleton.hpp"
#include "manager_interface.hpp" #include "manager_interface.hpp"
#ifdef __unix__ #if defined(__MINGW32__)
#include "sqlite3.h" #include "sqlite3/sqlite3.h"
#else #else
#include "sqlite3/sqlite3.h" #include "sqlite3.h"
#endif #endif
#include <functional> #include <functional>
server/linit.cpp
+3 -3
View File
@@ -34,10 +34,10 @@
#define linit_c #define linit_c
#define LUA_LIB #define LUA_LIB
#ifdef __unix__ #if defined(__MINGW32__)
#include "lua.hpp" #include "lua/lua.hpp"
#else #else
#include "lua/lua.hpp" #include "lua.hpp"
#endif #endif
#include "region_api.hpp" #include "region_api.hpp"
server/rooms/room_api.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef ROOMAPI_HPP_ #ifndef ROOMAPI_HPP_
#define ROOMAPI_HPP_ #define ROOMAPI_HPP_
#ifdef __unix__ #if defined(__MINGW32__)
#include "lua.hpp" #include "lua/lua.hpp"
#else #else
#include "lua/lua.hpp" #include "lua.hpp"
#endif #endif
#define TORTUGA_ROOM_NAME "Room" #define TORTUGA_ROOM_NAME "Room"
server/rooms/room_manager.hpp
+3 -3
View File
@@ -26,10 +26,10 @@
#include "singleton.hpp" #include "singleton.hpp"
#include "manager_interface.hpp" #include "manager_interface.hpp"
#ifdef __unix__ #if defined(__MINGW32__)
#include "lua.hpp" #include "lua/lua.hpp"
#else #else
#include "lua/lua.hpp" #include "lua.hpp"
#endif #endif
class RoomManager: class RoomManager:
server/rooms/room_manager_api.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef ROOMMANAGERAPI_HPP_ #ifndef ROOMMANAGERAPI_HPP_
#define ROOMMANAGERAPI_HPP_ #define ROOMMANAGERAPI_HPP_
#ifdef __unix__ #if defined(__MINGW32__)
#include "lua.hpp" #include "lua/lua.hpp"
#else #else
#include "lua/lua.hpp" #include "lua.hpp"
#endif #endif
#define TORTUGA_ROOM_MANAGER_NAME "RoomManager" #define TORTUGA_ROOM_MANAGER_NAME "RoomManager"
server/server_application.hpp
+5 -5
View File
@@ -35,12 +35,12 @@
#include "singleton.hpp" #include "singleton.hpp"
//APIs //APIs
#if __unix__ #if defined(__MINGW32__)
#include "lua.hpp" #include "lua/lua.hpp"
#include "sqlite3.h" #include "sqlite3/sqlite3.h"
#else #else
#include "lua/lua.hpp" #include "lua.hpp"
#include "sqlite3/sqlite3.h" #include "sqlite3.h"
#endif #endif
#include "SDL/SDL.h" #include "SDL/SDL.h"
server/server_utilities/sql_tools.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef SERVERUTILITY_HPP_ #ifndef SERVERUTILITY_HPP_
#define SERVERUTILITY_HPP_ #define SERVERUTILITY_HPP_
#ifdef __unix__ #if defined(__MINGW32__)
#include "sqlite3.h" #include "sqlite3/sqlite3.h"
#else #else
#include "sqlite3/sqlite3.h" #include "sqlite3.h"
#endif #endif
#include <string> #include <string>