applied patch mt3

master
OmniStudent 2014-05-04 10:56:18 +02:00
parent 4d87a88470
commit 4d9745d462
4 changed files with 14 additions and 3 deletions

BIN
.DS_Store vendored

Binary file not shown.

BIN
minetest/.DS_Store vendored

Binary file not shown.

View File

@ -1,21 +1,31 @@
# Package finder for gettext libs and include files
SET(CUSTOM_GETTEXT_PATH "${PROJECT_SOURCE_DIR}/../../gettext"
CACHE FILEPATH "path to custom gettext")
CACHE FILEPATH "/usr/local/opt/gettext")
# by default
SET(GETTEXT_FOUND FALSE)
FIND_PATH(GETTEXT_INCLUDE_DIR
NAMES libintl.h
PATHS "${CUSTOM_GETTEXT_PATH}/include"
PATHS "${CUSTOM_GETTEXT_PATH}/include" "/usr/local/opt/gettext/include"
DOC "gettext include directory")
FIND_PROGRAM(GETTEXT_MSGFMT
NAMES msgfmt
PATHS "${CUSTOM_GETTEXT_PATH}/bin"
PATHS "${CUSTOM_GETTEXT_PATH}/bin" "/usr/local/opt/gettext/bin"
DOC "path to msgfmt")
FIND_LIBRARY(GETTEXT_LIBRARY
NAMES libintl.a
PATHS "${CUSTOM_GETTEXT_PATH}/lib" "/usr/local/opt/gettext/lib"
DOC "gettext *intl*.lib")
FIND_LIBRARY(ICONV_LIBRARY
NAMES libiconv.dylib
PATHS "${CUSTOM_GETTEXT_PATH}/lib" "/usr/lib"
DOC "iconv lib")
# modern Linux, as well as Mac, seem to not need require special linking
# they do not because gettext is part of glibc
# TODO check the requirements on other BSDs and older Linux

View File

@ -522,6 +522,7 @@ if(BUILD_CLIENT)
${PNG_LIBRARIES}
${X11_LIBRARIES}
${GETTEXT_LIBRARY}
${ICONV_LIBRARY}
${SOUND_LIBRARIES}
${SQLITE3_LIBRARY}
${LUA_LIBRARY}