Changed missing library dependencies to simple fix

pull/104/head^2
Phillip Andrews 8 years ago
parent aeaedbc57a
commit c18fc113e5

@ -18,7 +18,3 @@ if (BUILD_WITH_CODE_COVERAGE)
add_definitions (--coverage) add_definitions (--coverage)
target_link_libraries(bsatool gcov) target_link_libraries(bsatool gcov)
endif() endif()
if(MSVC)
target_link_libraries(bsatool imm32.lib winmm.lib version.lib)
endif(MSVC)

@ -21,7 +21,3 @@ if (BUILD_WITH_CODE_COVERAGE)
add_definitions (--coverage) add_definitions (--coverage)
target_link_libraries(esmtool gcov) target_link_libraries(esmtool gcov)
endif() endif()
if(MSVC)
target_link_libraries(esmtool imm32.lib winmm.lib version.lib)
endif(MSVC)

@ -46,7 +46,3 @@ endif()
if (WIN32) if (WIN32)
INSTALL(TARGETS openmw-essimporter RUNTIME DESTINATION ".") INSTALL(TARGETS openmw-essimporter RUNTIME DESTINATION ".")
endif(WIN32) endif(WIN32)
if (MSVC)
target_link_libraries(openmw-essimporter imm32.lib winmm.lib version.lib)
endif(MSVC)

@ -96,10 +96,6 @@ target_link_libraries(openmw-launcher
components components
) )
if(MSVC)
target_link_libraries(openmw-launcher imm32.lib winmm.lib version.lib)
endif(MSVC)
if (DESIRED_QT_VERSION MATCHES 4) if (DESIRED_QT_VERSION MATCHES 4)
target_link_libraries(openmw-launcher ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}) target_link_libraries(openmw-launcher ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY})
if(WIN32) if(WIN32)

@ -25,10 +25,6 @@ if (WIN32)
INSTALL(TARGETS openmw-iniimporter RUNTIME DESTINATION ".") INSTALL(TARGETS openmw-iniimporter RUNTIME DESTINATION ".")
endif(WIN32) endif(WIN32)
if(MSVC)
target_link_libraries(openmw-iniimporter imm32.lib winmm.lib version.lib)
endif(MSVC)
if (MINGW) if (MINGW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode")
endif() endif()

@ -232,7 +232,6 @@ if (MSVC)
if (CMAKE_CL_64) if (CMAKE_CL_64)
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj") set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
endif (CMAKE_CL_64) endif (CMAKE_CL_64)
target_link_libraries(openmw-cs imm32.lib winmm.lib version.lib)
endif (MSVC) endif (MSVC)

@ -201,7 +201,6 @@ if (MSVC)
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj") set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
endif (CMAKE_CL_64) endif (CMAKE_CL_64)
add_definitions("-D_USE_MATH_DEFINES") add_definitions("-D_USE_MATH_DEFINES")
target_link_libraries(openmw imm32.lib winmm.lib version.lib)
endif (MSVC) endif (MSVC)
if (WIN32) if (WIN32)

@ -206,7 +206,7 @@ target_link_libraries(components
${OSGFX_LIBRARIES} ${OSGFX_LIBRARIES}
${OSGANIMATION_LIBRARIES} ${OSGANIMATION_LIBRARIES}
${Bullet_LIBRARIES} ${Bullet_LIBRARIES}
${SDL2_LIBRARY} ${SDL2_LIBRARIES}
# For MyGUI platform # For MyGUI platform
${GL_LIB} ${GL_LIB}
${MyGUI_LIBRARIES} ${MyGUI_LIBRARIES}

Loading…
Cancel
Save