summaryrefslogtreecommitdiffstats
path: root/lib/lua
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-12-27 11:51:08 +0100
committermadmaxoft <github@xoft.cz>2013-12-27 11:51:08 +0100
commit1cf6502be23ff78e07a96b906738c97805120ca0 (patch)
treea3dad40d5fd0556b17e1b95ce80e67e6f24b6fe2 /lib/lua
parentAdded proper precompiled headers for MSVC. (diff)
downloadcuberite-1cf6502be23ff78e07a96b906738c97805120ca0.tar
cuberite-1cf6502be23ff78e07a96b906738c97805120ca0.tar.gz
cuberite-1cf6502be23ff78e07a96b906738c97805120ca0.tar.bz2
cuberite-1cf6502be23ff78e07a96b906738c97805120ca0.tar.lz
cuberite-1cf6502be23ff78e07a96b906738c97805120ca0.tar.xz
cuberite-1cf6502be23ff78e07a96b906738c97805120ca0.tar.zst
cuberite-1cf6502be23ff78e07a96b906738c97805120ca0.zip
Diffstat (limited to '')
-rw-r--r--lib/lua/CMakeLists.txt21
1 files changed, 16 insertions, 5 deletions
diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt
index 4787b6aa6..81d019f00 100644
--- a/lib/lua/CMakeLists.txt
+++ b/lib/lua/CMakeLists.txt
@@ -8,12 +8,23 @@ file(GLOB SOURCE
"src/*.c"
)
-if(${STATIC_LUA})
-add_library(lua ${SOURCE})
+list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/src/lua.c" "${PROJECT_SOURCE_DIR}/src/luac.c")
+
+# add headers to MSVC project files:
+if (WIN32)
+ file(GLOB HEADERS "src/*.h")
+ list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/src/lua.h" "${PROJECT_SOURCE_DIR}/src/luac.h")
+ set(SOURCE ${SOURCE} ${HEADERS})
+ source_group("Sources" FILES ${SOURCE})
+endif()
+
+# Lua needs to be linked dynamically on Windows and statically on *nix, so that LuaRocks work
+if (WIN32)
+ add_library(lua SHARED ${SOURCE})
else()
-add_library(lua SHARED ${SOURCE})
+ add_library(lua ${SOURCE})
endif()
-if(UNIX)
-target_link_libraries(lua m dl)
+if (UNIX)
+ target_link_libraries(m dl)
endif()