Ver Fonte

Fixes build

Paul há 11 anos atrás
pai
commit
1aa09766ee

+ 9 - 1
CMakeLists.txt

@@ -137,11 +137,19 @@ set(QGears_INCLUDE_DIRS
     ${OGRE_Overlay_INCLUDE_DIRS}
     ${OGRE_SAMPLES_INCLUDEPATH}
     ${CMAKE_CURRENT_SOURCE_DIR}/dependencies
+	${CMAKE_CURRENT_BINARY_DIR}/dependencies/lua
+	${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lua/src
+	${CMAKE_CURRENT_SOURCE_DIR}/dependencies/luabind
+	${CMAKE_CURRENT_SOURCE_DIR}/dependencies/luabind/luabind/detail
+	${CMAKE_CURRENT_SOURCE_DIR}/dependencies/tinyxml
 )
 
-# Enable C++11, you may need to use -std=c++0x if using an older compiler
+
 if (MSVC)
+# Build cpp files on all cores
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 else()
+# Enable C++11, you may need to use -std=c++0x if using an older gcc compiler
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
 endif()
 

+ 1 - 0
QGearsMain/CMakeLists.txt

@@ -338,6 +338,7 @@ endif()
 set(LIBRARIES
     ${QGears_LIBRARIES}
     LuaBind
+	liblua_static
     TinyXml
     FinalFantasy7
 )

+ 1 - 1
QGearsMain/include/core/ScriptManager.h

@@ -7,7 +7,7 @@
 #include "Event.h"
 extern "C"
 {
-    #include <lua/lua.h>
+    #include <lua.h>
 }
 #include <luabind/luabind.hpp>
 

+ 3 - 3
QGearsMain/src/core/ScriptManager.cpp

@@ -10,9 +10,9 @@
 #include "core/XmlScriptsFile.h"
 extern "C"
 {
-    #include <lua/lua.h>
-    #include <lua/lualib.h>
-    #include <lua/lauxlib.h>
+    #include <lua.h>
+    #include <lualib.h>
+    #include <lauxlib.h>
 }
 #include <luabind/luabind.hpp>
 #include <luabind/yield_policy.hpp>

+ 11 - 1
dependencies/CMakeLists.txt

@@ -1,7 +1,17 @@
 include_directories(
     ${QGears_INCLUDE_DIRS}
+	luabind
+	lua/src
+	luabind/luabind
+	luabind/luabind/detail
+	${CMAKE_CURRENT_BINARY_DIR}/lua
 )
 
 add_subdirectory(tinyxml)
 add_subdirectory(lua)
-add_subdirectory(luabind)
+
+ aux_source_directory( luabind/luabind LuaBind_header_FILES )
+ aux_source_directory( luabind/luabind/details LuaBind_header_details_FILES )		
+ aux_source_directory( luabind/src LuaBind_src_FILES )		
+ add_library(LuaBind STATIC ${LuaBind_src_FILES} ${LuaBind_header_FILES} ${LuaBind_header_details_FILES})
+