diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-02 07:09:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-02 07:09:17 +0400 |
| commit | a9ef985b320363890a96c755bea4966d413ef9f1 (patch) | |
| tree | 2dacb8c799a23fb65c235ed4c0aaada9b26b3e36 /CMake | |
| parent | b26ef33b8ed68ba3b5a5a78a3f23fcade4035f31 (diff) | |
win32 was using iconv even when international was disabled.
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/macros.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index e8f378c0925..150bd55bfd7 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -105,7 +105,12 @@ MACRO(SETUP_LIBLINKS IF(WITH_INTERNATIONAL) TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB}) + + IF(WIN32) + TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB}) + ENDIF(WIN32) ENDIF(WITH_INTERNATIONAL) + IF(WITH_OPENAL) TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY}) ENDIF(WITH_OPENAL) @@ -121,9 +126,6 @@ MACRO(SETUP_LIBLINKS IF(WITH_SDL) TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY}) ENDIF(WITH_SDL) - IF(WIN32) - TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB}) - ENDIF(WIN32) IF(WITH_QUICKTIME) TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB}) ENDIF(WITH_QUICKTIME) |