Merge branch 'mingw-fix' into server-expansion

2014-11-05 23:55:38 +11:00
parent fc2bc06992 0f139562c3
commit 77b47b4634
14 changed files with 42 additions and 44 deletions
@@ -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: