diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 16:21:34 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 16:21:34 +0100 |
| commit | 1a9d93665f9f82ccd9054aa1c8e9c24f13776a91 (patch) | |
| tree | e9572b3fdf1d47c0769a3d43d3fc4dfac68fd0dd /CMakeLists.txt | |
| parent | basic threadsafe queue interface (diff) | |
| parent | Update GETTING-STARTED.md (diff) | |
| download | cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar.gz cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar.bz2 cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar.lz cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar.xz cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar.zst cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.zip | |
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 17eee02bb..0df702b29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") add_definitions(-DCRYPTOPP_DISABLE_ASM) endif() -add_definitions(-DLUA_USE_DLOPEN) +# 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/) add_subdirectory(lib/jsoncpp/) @@ -106,10 +112,13 @@ else() add_flags("/Wall") endif() set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE_BAK}") -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic") -set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic") -set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -rdynamic") -set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_PROFILE} -rdynamic") + +if (NOT WIN32) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic") + set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic") + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -rdynamic") + set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_PROFILE} -rdynamic") +endif() add_subdirectory (src) |