summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2015-05-25 08:07:18 +0200
committerAlexander Harkness <me@bearbin.net>2015-05-25 08:07:18 +0200
commit150024265e10cc5f5769d5638c10078ec493f210 (patch)
tree72dbacde2f6f5a25db9d3f3c9800280ba15ad130 /src
parentMerge pull request #2114 from cengizIO/master (diff)
parentSupport building on FreeBSD (diff)
downloadcuberite-150024265e10cc5f5769d5638c10078ec493f210.tar
cuberite-150024265e10cc5f5769d5638c10078ec493f210.tar.gz
cuberite-150024265e10cc5f5769d5638c10078ec493f210.tar.bz2
cuberite-150024265e10cc5f5769d5638c10078ec493f210.tar.lz
cuberite-150024265e10cc5f5769d5638c10078ec493f210.tar.xz
cuberite-150024265e10cc5f5769d5638c10078ec493f210.tar.zst
cuberite-150024265e10cc5f5769d5638c10078ec493f210.zip
Diffstat (limited to '')
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/OSSupport/Errors.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 25de24c91..1b721100d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -332,4 +332,9 @@ endif ()
if (WIN32)
target_link_libraries(${EXECUTABLE} expat tolualib ws2_32.lib Psapi.lib)
endif()
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+ add_flags_lnk(-L/usr/local/lib)
+endif()
+
target_link_libraries(${EXECUTABLE} luaexpat jsoncpp mbedtls zlib sqlite lua SQLiteCpp event_core event_extra)
diff --git a/src/OSSupport/Errors.cpp b/src/OSSupport/Errors.cpp
index a5361e1a6..407799495 100644
--- a/src/OSSupport/Errors.cpp
+++ b/src/OSSupport/Errors.cpp
@@ -22,7 +22,7 @@ AString GetOSErrorString( int a_ErrNo)
// According to http://linux.die.net/man/3/strerror_r there are two versions of strerror_r():
- #if !defined(__APPLE__) && ( _GNU_SOURCE) && !defined(ANDROID_NDK) // GNU version of strerror_r()
+ #if !defined(__APPLE__) && defined( _GNU_SOURCE) && !defined(ANDROID_NDK) // GNU version of strerror_r()
char * res = strerror_r( errno, buffer, ARRAYCOUNT(buffer));
if (res != nullptr)