Merge branch 'mingw-fix' into server-expansion

common/map/region_api.hpp

@@ -22,10 +22,10 @@
 #ifndef REGIONAPI_HPP_
 #define REGIONAPI_HPP_
 
-#ifdef __unix__
-#include "lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
 #else
-#include "lua/lua.hpp"
+ #include "lua.hpp"
 #endif
 
 #define TORTUGA_REGION_NAME "Region"

common/map/region_pager_api.hpp

@@ -22,10 +22,10 @@
 #ifndef REGIONPAGERAPI_HPP_
 #define REGIONPAGERAPI_HPP_
 
-#ifdef __unix__
-#include "lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
 #else
-#include "lua/lua.hpp"
+ #include "lua.hpp"
 #endif
 
 #define TORTUGA_REGION_PAGER_NAME "RegionPager"

common/map/region_pager_lua.hpp

@@ -24,10 +24,10 @@
 
 #include "region_pager_base.hpp"
 
-#ifdef __unix__
-#include "lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
 #else
-#include "lua/lua.hpp"
+ #include "lua.hpp"
 #endif
 
 #include <string>

common/map/tile_sheet_api.hpp

@@ -22,10 +22,10 @@
 #ifndef TILESHEETAPI_HPP_
 #define TILESHEETAPI_HPP_
 
-#ifdef __unix__
-#include "lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
 #else
-#include "lua/lua.hpp"
+ #include "lua.hpp"
 #endif
 
 

common/utilities/utility.cpp

@@ -29,10 +29,8 @@ std::string truncatePath(std::string pathname) {
 			pathname.rbegin(),
 			pathname.rend(),
 			[](char ch) -> bool {
-				//windows only
+				//windows & unix tested
 				return ch == '/' || ch == '\\';
-//				//unix only
-//				return ch == '/';
 			}).base(),
 		pathname.end());
 }

server/accounts/account_manager.hpp

@@ -26,10 +26,10 @@
 #include "singleton.hpp"
 #include "manager_interface.hpp"
 
-#ifdef __unix__
-#include "sqlite3.h"
+#if defined(__MINGW32__)
+ #include "sqlite3/sqlite3.h"
 #else
-#include "sqlite3/sqlite3.h"
+ #include "sqlite3.h"
 #endif
 
 #include <functional>

server/characters/character_manager.cpp

@@ -21,10 +21,10 @@
 */
 #include "character_manager.hpp"
 
-#ifdef __unix__
-#include "sqlite3.h"
+#if defined(__MINGW32__)
+ #include "sqlite3/sqlite3.h"
 #else
-#include "sqlite3/sqlite3.h"
+ #include "sqlite3.h"
 #endif
 
 #include <algorithm>

server/characters/character_manager.hpp

@@ -26,10 +26,10 @@
 #include "singleton.hpp"
 #include "manager_interface.hpp"
 
-#ifdef __unix__
-#include "sqlite3.h"
+#if defined(__MINGW32__)
+ #include "sqlite3/sqlite3.h"
 #else
-#include "sqlite3/sqlite3.h"
+ #include "sqlite3.h"
 #endif
 
 #include <functional>

server/linit.cpp

@@ -34,10 +34,10 @@
 #define linit_c
 #define LUA_LIB
 
-#ifdef __unix__
-#include "lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
 #else
-#include "lua/lua.hpp"
+ #include "lua.hpp"
 #endif
 
 #include "region_api.hpp"

server/rooms/room_api.hpp

@@ -22,10 +22,10 @@
 #ifndef ROOMAPI_HPP_
 #define ROOMAPI_HPP_
 
-#ifdef __unix__
-#include "lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
 #else
-#include "lua/lua.hpp"
+ #include "lua.hpp"
 #endif
 
 #define TORTUGA_ROOM_NAME "Room"

server/rooms/room_manager.hpp

@@ -26,10 +26,10 @@
 #include "singleton.hpp"
 #include "manager_interface.hpp"
 
-#ifdef __unix__
-#include "lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
 #else
-#include "lua/lua.hpp"
+ #include "lua.hpp"
 #endif
 
 class RoomManager:

server/rooms/room_manager_api.hpp

@@ -22,10 +22,10 @@
 #ifndef ROOMMANAGERAPI_HPP_
 #define ROOMMANAGERAPI_HPP_
 
-#ifdef __unix__
-#include "lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
 #else
-#include "lua/lua.hpp"
+ #include "lua.hpp"
 #endif
 
 #define TORTUGA_ROOM_MANAGER_NAME "RoomManager"

server/server_application.hpp

@@ -35,12 +35,12 @@
 #include "singleton.hpp"
 
 //APIs
-#if __unix__
-#include "lua.hpp"
-#include "sqlite3.h"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+ #include "sqlite3/sqlite3.h"
 #else
-#include "lua/lua.hpp"
-#include "sqlite3/sqlite3.h"
+ #include "lua.hpp"
+ #include "sqlite3.h"
 #endif
 
 #include "SDL/SDL.h"

server/server_utilities/sql_tools.hpp

@@ -22,10 +22,10 @@
 #ifndef SERVERUTILITY_HPP_
 #define SERVERUTILITY_HPP_
 
-#ifdef __unix__
-#include "sqlite3.h"
+#if defined(__MINGW32__)
+ #include "sqlite3/sqlite3.h"
 #else
-#include "sqlite3/sqlite3.h"
+ #include "sqlite3.h"
 #endif
 
 #include <string>