Revision: 23599 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23599 Author: campbellbarton Date: 2009-10-02 05:09:17 +0200 (Fri, 02 Oct 2009)
Log Message: ----------- win32 was using iconv even when international was disabled. Modified Paths: -------------- trunk/blender/CMake/macros.cmake Modified: trunk/blender/CMake/macros.cmake =================================================================== --- trunk/blender/CMake/macros.cmake 2009-10-01 23:32:57 UTC (rev 23598) +++ trunk/blender/CMake/macros.cmake 2009-10-02 03:09:17 UTC (rev 23599) @@ -105,7 +105,12 @@ 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 @@ 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) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs