summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-12-27 12:01:45 +0100
committermadmaxoft <github@xoft.cz>2013-12-27 12:01:45 +0100
commitf5c013071eeec698d36971403b19ed39bfa02ffc (patch)
tree65a4af510bf272fc302c40dd5e2b7c8302520e0c
parentFixed unix Lua dependencies. (diff)
downloadcuberite-f5c013071eeec698d36971403b19ed39bfa02ffc.tar
cuberite-f5c013071eeec698d36971403b19ed39bfa02ffc.tar.gz
cuberite-f5c013071eeec698d36971403b19ed39bfa02ffc.tar.bz2
cuberite-f5c013071eeec698d36971403b19ed39bfa02ffc.tar.lz
cuberite-f5c013071eeec698d36971403b19ed39bfa02ffc.tar.xz
cuberite-f5c013071eeec698d36971403b19ed39bfa02ffc.tar.zst
cuberite-f5c013071eeec698d36971403b19ed39bfa02ffc.zip
-rw-r--r--CMakeLists.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa3658583..0df702b29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
add_definitions(-DCRYPTOPP_DISABLE_ASM)
endif()
-add_definitions(-DLUA_BUILD_AS_DLL)
+# Under Windows, we need Lua as DLL; on *nix we need it linked statically:
+if (WIN32)
+ add_definitions(-DLUA_BUILD_AS_DLL)
+endif()
+
+# The Expat library is linked in statically, make the source files aware of that:
add_definitions(-DXML_STATIC)
add_subdirectory(lib/inifile/)