Theoretically resolved jenky cross-compiler compatability

This commit is contained in:
Kayne Ruse
2014-11-05 23:54:10 +11:00
parent 4434900afc
commit 0f139562c3
14 changed files with 42 additions and 44 deletions
+3 -3
View File
@@ -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>
+3 -3
View File
@@ -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>
+3 -3
View File
@@ -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>
+3 -3
View File
@@ -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"
+3 -3
View File
@@ -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"
+3 -3
View File
@@ -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:
+3 -3
View File
@@ -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"
+5 -5
View File
@@ -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"
+3 -3
View File
@@ -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>