diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-08-11 12:32:36 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-08-11 12:32:36 +0300 |
| commit | 69fca4f3cb59b3c3c5788830807d241fc8a0fc9a (patch) | |
| tree | a72364abcca170bf0389785f37f6ef079d7bb84d | |
| parent | 34492ce4803982a0aab84be88eab24b6ff0b4c3b (diff) | |
| parent | f6ed45fc20876fb01027446a1c3960658c030870 (diff) | |
| download | minetest-69fca4f3cb59b3c3c5788830807d241fc8a0fc9a.tar.gz minetest-69fca4f3cb59b3c3c5788830807d241fc8a0fc9a.tar.bz2 minetest-69fca4f3cb59b3c3c5788830807d241fc8a0fc9a.zip | |
Merged some FreeBSD fixes
| -rw-r--r-- | cmake/Modules/FindGettextLib.cmake | 5 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/debug.cpp | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake index 18935eaad..5779b6b64 100644 --- a/cmake/Modules/FindGettextLib.cmake +++ b/cmake/Modules/FindGettextLib.cmake @@ -41,7 +41,6 @@ IF (WIN32) DOC "gettext *iconv*.lib") ENDIF(WIN32) - IF(GETTEXT_INCLUDE_DIR AND GETTEXT_MSGFMT) IF (WIN32) # in the Win32 case check also for the extra linking requirements @@ -49,6 +48,10 @@ IF(GETTEXT_INCLUDE_DIR AND GETTEXT_MSGFMT) SET(GETTEXT_FOUND TRUE) ENDIF() ELSE(WIN32) + # *BSD variants require special linkage as they don't use glibc + IF(${CMAKE_SYSTEM_NAME} MATCHES "BSD") + SET(GETTEXT_LIBRARY "intl") + ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "BSD") SET(GETTEXT_FOUND TRUE) ENDIF(WIN32) ENDIF() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 883b809e2..0fceb85e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -173,7 +173,7 @@ include_directories( ${SQLITE3_INCLUDE_DIR} ) -set(EXECUTABLE_OUTPUT_PATH ../bin) +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin") if(BUILD_CLIENT) add_executable(${PROJECT_NAME} ${minetest_SRCS}) diff --git a/src/debug.cpp b/src/debug.cpp index a19186232..befd73a38 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -68,9 +68,9 @@ Nullstream dummyout; void assert_fail(const char *assertion, const char *file, unsigned int line, const char *function) { - DEBUGPRINT("\nIn thread %x:\n" + DEBUGPRINT("\nIn thread %lx:\n" "%s:%d: %s: Assertion '%s' failed.\n", - (unsigned int)get_current_thread_id(), + (unsigned long)get_current_thread_id(), file, line, function, assertion); debug_stacks_print(); @@ -95,8 +95,8 @@ DebugStack::DebugStack(threadid_t id) void DebugStack::print(FILE *file, bool everything) { - fprintf(file, "DEBUG STACK FOR THREAD %x:\n", - (unsigned int)threadid); + fprintf(file, "DEBUG STACK FOR THREAD %lx:\n", + (unsigned long)threadid); for(int i=0; i<stack_max_i; i++) { |