Merge branch 'mingw-fix' into server-expansion

This commit is contained in:
Kayne Ruse
2014-11-05 23:55:38 +11:00
14 changed files with 42 additions and 44 deletions
+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>