forked from teamnwah/openmw-tes3coop
Build fixes for windows
This commit is contained in:
parent
675884ba30
commit
609e146a22
4 changed files with 19 additions and 2 deletions
|
@ -105,6 +105,9 @@ if (DESIRED_QT_VERSION MATCHES 4)
|
|||
endif(WIN32)
|
||||
else()
|
||||
qt5_use_modules(openmw-launcher Widgets Core)
|
||||
if (WIN32)
|
||||
target_link_libraries(Qt5::WinMain)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (BUILD_WITH_CODE_COVERAGE)
|
||||
|
|
|
@ -216,8 +216,16 @@ if (DESIRED_QT_VERSION MATCHES 4)
|
|||
${QT_QTGUI_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${QT_QTNETWORK_LIBRARY})
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(openmw-cs ${QT_QTMAIN_LIBRARY})
|
||||
endif()
|
||||
|
||||
else()
|
||||
qt5_use_modules(openmw-cs Widgets Core Network)
|
||||
if (WIN32)
|
||||
target_link_libraries(Qt5::WinMain)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (WIN32)
|
||||
|
|
|
@ -123,8 +123,15 @@ if (DESIRED_QT_VERSION MATCHES 4)
|
|||
target_link_libraries(openmw-wizard
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY})
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(openmw-wizard ${QT_QTMAIN_LIBRARY})
|
||||
endif()
|
||||
else()
|
||||
qt5_use_modules(openmw-wizard Widgets Core)
|
||||
if (WIN32)
|
||||
target_link_libraries(Qt5::WinMain)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (OPENMW_USE_UNSHIELD)
|
||||
|
|
|
@ -11,8 +11,7 @@ set(OGRE_FFMPEG_VIDEOPLAYER_SOURCE_FILES
|
|||
audiofactory.hpp
|
||||
)
|
||||
|
||||
# Find Boost
|
||||
|
||||
include_directories(${FFMPEG_INCLUDE_DIRS})
|
||||
add_library(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OGRE_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
|
||||
target_link_libraries(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFMPEG_LIBRARIES} ${Boost_THREAD_LIBRARY})
|
||||
|
||||
|
|
Loading…
Reference in a new issue