Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Find correct library for MSVC vs MingW in Winows

This commit is contained in:
Giuseppe Bilotta 2011-07-21 14:50:15 +02:00
parent 3e78b29cae
commit 9fa4b72a47
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/Modules/FindGettextLib.cmake
View File

@ -20,8 +20,15 @@ FIND_PROGRAM(GETTEXT_MSGFMT
# 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
IF (WIN32) IF (WIN32)
IF(MSVC)
SET(GETTEXT_LIB_NAMES
libintl.lib intl.lib libintl3.lib intl3.lib)
ELSE()
SET(GETTEXT_LIB_NAMES
libintl.dll.a intl.dll.a libintl3.dll.a intl3.dll.a)
ENDIF()
FIND_LIBRARY(GETTEXT_LIBRARY FIND_LIBRARY(GETTEXT_LIBRARY
NAMES libintl.lib intl.lib libintl3.lib intl3.lib NAMES ${GETTEXT_LIB_NAMES}
PATHS "${CUSTOM_GETTEXT_PATH}/lib" PATHS "${CUSTOM_GETTEXT_PATH}/lib"
DOC "gettext *intl*.lib") DOC "gettext *intl*.lib")
FIND_LIBRARY(GETTEXT_DLL FIND_LIBRARY(GETTEXT_DLL

4
src/CMakeLists.txt
View File

@ -235,10 +235,6 @@ else()
set(ARCH i386) set(ARCH i386)
endif() endif()
if(WIN32 AND USE_GETTEXT)
set(CMAKE_EXE_LINKER_FLAGS "-l${GETTEXT_LIBRARY}")
endif()
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops") set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}")