diff options
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/macros.cmake | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 95799a2c1fd..bc8892e4b99 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -43,9 +43,9 @@ MACRO(SETUP_LIBDIRS) CMAKE_POLICY(SET CMP0003 NEW) endif(COMMAND cmake_policy) LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH}) + LINK_DIRECTORIES(${FREETYPE_LIBPATH}) IF(WITH_INTERNATIONAL) LINK_DIRECTORIES(${GETTEXT_LIBPATH}) - LINK_DIRECTORIES(${FREETYPE_LIBPATH}) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENAL) LINK_DIRECTORIES(${OPENAL_LIBPATH}) @@ -59,9 +59,43 @@ ENDMACRO(SETUP_LIBDIRS) MACRO(SETUP_LIBLINKS target) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ") - TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) + #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) + + TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) + + # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions + + IF(WIN32) + + TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d) + + TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB}) + + ELSE(WIN32) + + TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB}) + + ENDIF(WIN32) + + + TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) + TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB}) + + # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions + + IF(WIN32) + + TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d) + + TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB}) + + ELSE(WIN32) + + TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB}) + + ENDIF(WIN32) + IF(WITH_INTERNATIONAL) - TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB}) TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB}) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENAL) |