Belugion
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

BIN
minetest/.DS_Store vendored
View File

Binary file not shown.

16
minetest/cmake/Modules/FindGettextLib.cmake
View File

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

1
minetest/src/CMakeLists.txt
View File

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