diff options
| author | Mattes D <github@xoft.cz> | 2014-06-14 17:03:06 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-06-14 17:03:06 +0200 |
| commit | c0bc4a9d3a82e987ff553e07e3a127744b02819d (patch) | |
| tree | 65a8bba3141ec84b1a6325aa4407ba2593af38b3 | |
| parent | Remove windows bindings crutch (diff) | |
| parent | Fixed bindings generation for Win64 builds. (diff) | |
| download | cuberite-c0bc4a9d3a82e987ff553e07e3a127744b02819d.tar cuberite-c0bc4a9d3a82e987ff553e07e3a127744b02819d.tar.gz cuberite-c0bc4a9d3a82e987ff553e07e3a127744b02819d.tar.bz2 cuberite-c0bc4a9d3a82e987ff553e07e3a127744b02819d.tar.lz cuberite-c0bc4a9d3a82e987ff553e07e3a127744b02819d.tar.xz cuberite-c0bc4a9d3a82e987ff553e07e3a127744b02819d.tar.zst cuberite-c0bc4a9d3a82e987ff553e07e3a127744b02819d.zip | |
| -rw-r--r-- | src/Bindings/.gitignore | 1 | ||||
| -rw-r--r-- | src/Bindings/lua51.dll | bin | 167424 -> 0 bytes | |||
| -rw-r--r-- | src/CMakeLists.txt | 40 |
3 files changed, 32 insertions, 9 deletions
diff --git a/src/Bindings/.gitignore b/src/Bindings/.gitignore new file mode 100644 index 000000000..af8aa76fa --- /dev/null +++ b/src/Bindings/.gitignore @@ -0,0 +1 @@ +lua51.dll diff --git a/src/Bindings/lua51.dll b/src/Bindings/lua51.dll Binary files differdeleted file mode 100644 index 515cf8b30..000000000 --- a/src/Bindings/lua51.dll +++ /dev/null diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 65cf14a7f..335ce8315 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -82,17 +82,36 @@ set(BINDING_DEPENDECIES include_directories(Bindings) include_directories(.) -ADD_CUSTOM_COMMAND( - # add any new generated bindings here - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.h +if (WIN32) + ADD_CUSTOM_COMMAND( + # add any new generated bindings here + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.h - # command execuded to regerate bindings - COMMAND tolua -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/ + # Copy the Lua DLL into the Bindings folder, so that tolua can run from there: + COMMAND copy /y ..\\..\\MCServer\\lua51.dll . - # add any new generation dependencies here - DEPENDS ${BINDING_DEPENDECIES} -) + # Regenerate bindings: + COMMAND tolua -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/ + + # add any new generation dependencies here + DEPENDS ${BINDING_DEPENDECIES} + ) +else () + ADD_CUSTOM_COMMAND( + # add any new generated bindings here + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/Bindings.h + + # Regenerate bindings: + COMMAND tolua -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/ + + # add any new generation dependencies here + DEPENDS ${BINDING_DEPENDECIES} + ) +endif () +set_source_files_properties(Bindings/Bindings.cpp PROPERTIES GENERATED TRUE) +set_source_files_properties(Bindings/Bindings.h PROPERTIES GENERATED TRUE) if (NOT MSVC) @@ -157,6 +176,9 @@ else () ) source_group("" FILES ${SOURCE}) + LIST(APPEND SOURCE "Bindings/Bindings.cpp" "Bindings/Bindings.h") + source_group(Bindings FILES "Bindings/Bindings.cpp" "Bindings/Bindings.h") + # Add all subfolders as solution-folders: list(APPEND FOLDERS "Resources") list(APPEND FOLDERS "Bindings") |