summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-05-29 09:14:47 +0200
committermadmaxoft <github@xoft.cz>2014-05-29 09:14:47 +0200
commitb56033d5416306eb71bef9659fee92b368d4436e (patch)
tree7647fc9b8a29dc5ec0bc7258c68e4a59d113b205 /lib
parentFixed a crash in message formatter. (diff)
parentCmake system name not System name (diff)
downloadcuberite-b56033d5416306eb71bef9659fee92b368d4436e.tar
cuberite-b56033d5416306eb71bef9659fee92b368d4436e.tar.gz
cuberite-b56033d5416306eb71bef9659fee92b368d4436e.tar.bz2
cuberite-b56033d5416306eb71bef9659fee92b368d4436e.tar.lz
cuberite-b56033d5416306eb71bef9659fee92b368d4436e.tar.xz
cuberite-b56033d5416306eb71bef9659fee92b368d4436e.tar.zst
cuberite-b56033d5416306eb71bef9659fee92b368d4436e.zip
Diffstat (limited to 'lib')
-rw-r--r--lib/lua/CMakeLists.txt6
-rw-r--r--lib/sqlite/CMakeLists.txt4
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt
index db112d557..6e5e0f565 100644
--- a/lib/lua/CMakeLists.txt
+++ b/lib/lua/CMakeLists.txt
@@ -20,6 +20,12 @@ endif()
# Lua needs to be linked dynamically on Windows and statically on *nix, so that LuaRocks work
if (WIN32)
+
+ #for compiliers other than msvc we need to tell lua that its building as a dll
+ if (NOT MSVC)
+ add_flags_cxx(-DLUA_BUILD_AS_DLL=1)
+ endif()
+
add_library(lua SHARED ${SOURCE})
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/MCServer)
diff --git a/lib/sqlite/CMakeLists.txt b/lib/sqlite/CMakeLists.txt
index 0815127ef..9add2280b 100644
--- a/lib/sqlite/CMakeLists.txt
+++ b/lib/sqlite/CMakeLists.txt
@@ -17,6 +17,10 @@ if (WIN32)
source_group("Sources" FILES ${SOURCE})
endif()
+# FreeBSD requires us to define this to get POSIX 2001 standard
+if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+ add_flags_cxx(-D__POSIX_VISIBLE=200112)
+endif()
add_library(sqlite ${SOURCE})