diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-08-31 05:57:53 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-08-31 05:57:53 +0400 |
| commit | 9818b8a95c49296218870ab2ad784f0fe55fe5d7 (patch) | |
| tree | 4d1a70ea798e433b4fd4eb45e95924adeb459d9c /CMakeLists.txt | |
| parent | 25c116e80af425e76a33a5b23fc8c96b01a8eb63 (diff) | |
Fix for win64 building (gettextlib had wrong name)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b86ca8f21e..97113c22f98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,7 +248,11 @@ IF(WIN32) SET(GETTEXT ${LIBDIR}/gettext) SET(GETTEXT_INC ${GETTEXT}/include) - SET(GETTEXT_LIB gnu_gettext) + IF(CMAKE_CL_64) + SET(GETTEXT_LIB gettextlib) + ELSE(CMAKE_CL_64) + SET(GETTEXT_LIB gnu_gettext) + ENDIF(CMAKE_CL_64) SET(GETTEXT_LIBPATH ${GETTEXT}/lib) SET(FREETYPE ${LIBDIR}/freetype) @@ -279,7 +283,12 @@ IF(WIN32) SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0) SET(FFMPEG_LIBPATH ${FFMPEG}/lib) + IF(CMAKE_CL_64) + SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 ) + ELSE(CMAKE_CL_64) SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm) + ENDIF(CMAKE_CL_64) + IF(WITH_OPENAL) SET(LLIBS ${LLIBS} dxguid) ENDIF(WITH_OPENAL) @@ -317,7 +326,7 @@ IF(WIN32) SET(WINTAB_INC ${LIBDIR}/wintab/include) IF(CMAKE_CL_64) - SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib;MSVCRT.lib ") + SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ") ELSE(CMAKE_CL_64) SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ") ENDIF(CMAKE_CL_64) |