Paul 11 лет назад
Родитель
Сommit
69a592d48c
1 измененных файлов с 12 добавлено и 8 удалено
  1. 12 8
      QGearsMain/include/LuaIncludes.h

+ 12 - 8
QGearsMain/include/LuaIncludes.h

@@ -1,21 +1,25 @@
 #pragma once
 
 // Wraps the LUA includes for platform specific build workarounds
-
-extern "C"
-{
-    #include <lua.h>
-    #include <lualib.h>
-    #include <lauxlib.h>
-}
-
 #ifdef __APPLE__
 // Something in the Apple headers seems to #define nil as __NULL 
 // this then causes a build error in luabind:
 // luabind/nil.hpp:36:40: error: expected unqualified-id
 // extern LUABIND_API detail::nil_type nil;
 #undef nil
+
+// Causes a build error, usually an ICE on g++
+#undef check
 #endif
 
 #include <luabind/luabind.hpp>
 #include <luabind/yield_policy.hpp>
+
+
+extern "C"
+{
+    #include <lua.h>
+    #include <lualib.h>
+    #include <lauxlib.h>
+}
+