krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Build fixes for windows

Browse source
This commit is contained in:
scrawl 2015-06-15 14:16:14 +02:00
parent 675884ba30
commit 609e146a22
4 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/launcher/CMakeLists.txt
View file

@ -105,6 +105,9 @@ if (DESIRED_QT_VERSION MATCHES 4)
endif(WIN32) endif(WIN32)
else() else()
qt5_use_modules(openmw-launcher Widgets Core) qt5_use_modules(openmw-launcher Widgets Core)
if (WIN32)
target_link_libraries(Qt5::WinMain)
endif()
endif() endif()
if (BUILD_WITH_CODE_COVERAGE) if (BUILD_WITH_CODE_COVERAGE)

8
apps/opencs/CMakeLists.txt
View file

@ -216,8 +216,16 @@ if (DESIRED_QT_VERSION MATCHES 4)
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTNETWORK_LIBRARY}) ${QT_QTNETWORK_LIBRARY})
if (WIN32)
target_link_libraries(openmw-cs ${QT_QTMAIN_LIBRARY})
endif()
else() else()
qt5_use_modules(openmw-cs Widgets Core Network) qt5_use_modules(openmw-cs Widgets Core Network)
if (WIN32)
target_link_libraries(Qt5::WinMain)
endif()
endif() endif()
if (WIN32) if (WIN32)

7
apps/wizard/CMakeLists.txt
View file

@ -123,8 +123,15 @@ if (DESIRED_QT_VERSION MATCHES 4)
target_link_libraries(openmw-wizard target_link_libraries(openmw-wizard
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTCORE_LIBRARY}) ${QT_QTCORE_LIBRARY})
if (WIN32)
target_link_libraries(openmw-wizard ${QT_QTMAIN_LIBRARY})
endif()
else() else()
qt5_use_modules(openmw-wizard Widgets Core) qt5_use_modules(openmw-wizard Widgets Core)
if (WIN32)
target_link_libraries(Qt5::WinMain)
endif()
endif() endif()
if (OPENMW_USE_UNSHIELD) if (OPENMW_USE_UNSHIELD)

3
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt vendored
View file

@ -11,8 +11,7 @@ set(OGRE_FFMPEG_VIDEOPLAYER_SOURCE_FILES
audiofactory.hpp audiofactory.hpp
) )
# Find Boost include_directories(${FFMPEG_INCLUDE_DIRS})
add_library(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OGRE_FFMPEG_VIDEOPLAYER_SOURCE_FILES}) add_library(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OGRE_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
target_link_libraries(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFMPEG_LIBRARIES} ${Boost_THREAD_LIBRARY}) target_link_libraries(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFMPEG_LIBRARIES} ${Boost_THREAD_LIBRARY})