diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-10 23:59:53 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-10 23:59:53 +0100 |
| commit | 712f7d5a23015c08c2b838bd0107d21bdbbf5390 (patch) | |
| tree | a63c9acc7259708a3ba2b6996bf9c533805a56ee | |
| parent | more cmake changes (diff) | |
| download | cuberite-712f7d5a23015c08c2b838bd0107d21bdbbf5390.tar cuberite-712f7d5a23015c08c2b838bd0107d21bdbbf5390.tar.gz cuberite-712f7d5a23015c08c2b838bd0107d21bdbbf5390.tar.bz2 cuberite-712f7d5a23015c08c2b838bd0107d21bdbbf5390.tar.lz cuberite-712f7d5a23015c08c2b838bd0107d21bdbbf5390.tar.xz cuberite-712f7d5a23015c08c2b838bd0107d21bdbbf5390.tar.zst cuberite-712f7d5a23015c08c2b838bd0107d21bdbbf5390.zip | |
| -rw-r--r-- | src/Bindings/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/OSSupport/CMakeLists.txt | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt index f2c2fa3ab..cee61c13c 100644 --- a/src/Bindings/CMakeLists.txt +++ b/src/Bindings/CMakeLists.txt @@ -5,10 +5,12 @@ project (MCServer) include_directories ("${PROJECT_SOURCE_DIR}/../") ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/foo.c - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bar.c ${CMAKE_CURRENT_BINARY_DIR}/foo.c - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bar.c +#add any new generated bindings here + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Bindings.cpp ${CMAKE_CURRENT_BINARY_DIR}/Bindings.h +#command execuded to regerate bindings + COMMAND "./tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg +#add any new generation dependencies here + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/virtual_method_hooks.lua ${CMAKE_CURRENT_SOURCE_DIR}/AllToLua.pkg ) -execute_process(COMMAND "./tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg) add_library(Bindings PluginManager LuaState WebPlugin) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a5b1fab63..55dfc09c7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,10 +22,11 @@ add_subdirectory(Entities) add_subdirectory(Simulator) file(GLOB SOURCE - "*.h" "*.cpp" ) +list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/StackWalker.cpp") + add_executable(../MCServer/MCServer ${SOURCE}) target_link_libraries(../MCServer/MCServer OSSupport HTTPServer iniFile Bindings Items Blocks) diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt index e559ca681..8eeff9d9b 100644 --- a/src/OSSupport/CMakeLists.txt +++ b/src/OSSupport/CMakeLists.txt @@ -4,7 +4,6 @@ project (MCServer) include_directories ("${PROJECT_SOURCE_DIR}/../") file(GLOB SOURCE - "*.h" "*.cpp" ) |