diff options
| author | tycho <tycho@hanoverdesktop> | 2013-12-20 16:37:35 +0100 |
|---|---|---|
| committer | tycho <tycho@hanoverdesktop> | 2013-12-20 16:37:35 +0100 |
| commit | f6d5a788aa0498da70eb9693043625b35a54c387 (patch) | |
| tree | d25714b79fe32643e08c4196e1a445e063640214 | |
| parent | Merge branch 'master' into cmake (diff) | |
| download | cuberite-f6d5a788aa0498da70eb9693043625b35a54c387.tar cuberite-f6d5a788aa0498da70eb9693043625b35a54c387.tar.gz cuberite-f6d5a788aa0498da70eb9693043625b35a54c387.tar.bz2 cuberite-f6d5a788aa0498da70eb9693043625b35a54c387.tar.lz cuberite-f6d5a788aa0498da70eb9693043625b35a54c387.tar.xz cuberite-f6d5a788aa0498da70eb9693043625b35a54c387.tar.zst cuberite-f6d5a788aa0498da70eb9693043625b35a54c387.zip | |
| -rw-r--r-- | lib/lua/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Bindings/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 9 |
3 files changed, 12 insertions, 1 deletions
diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt index ed1627a67..695d75e7e 100644 --- a/lib/lua/CMakeLists.txt +++ b/lib/lua/CMakeLists.txt @@ -14,4 +14,6 @@ else() add_library(lua SHARED ${SOURCE}) endif() +if(UNIX) target_link_libraries(lua m) +endif()
\ No newline at end of file diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt index 469daddec..41c641d9d 100644 --- a/src/Bindings/CMakeLists.txt +++ b/src/Bindings/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories ("${PROJECT_SOURCE_DIR}/../") #add any new generation dependencies here DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/virtual_method_hooks.lua ${CMAKE_CURRENT_SOURCE_DIR}/AllToLua.pkg tolua ) - + #add cpp files here add_library(Bindings PluginManager LuaState WebPlugin Bindings ManualBindings LuaWindow Plugin PluginLua WebPlugin) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a557b7dac..9b461ff94 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,6 +43,15 @@ file(GLOB_RECURSE SOURCE include_directories("${PROJECT_SOURCE_DIR}") +ADD_CUSTOM_COMMAND( +#add any new generated bindings here + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Bindings/Bindings.cpp ${CMAKE_CURRENT_BINARY_DIR}/Bindings/Bindings.h +#command execuded to regerate bindings + COMMAND tolua -L virtual_method_hooks.lua -o Bindings/Bindings.cpp -H Bindings/Bindings.h AllToLua.pkg +#add any new generation dependencies here + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/virtual_method_hooks.lua ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/AllToLua.pkg tolua + ) + source_group("" FILES ${SOURCE}) endif() |