mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-28 14:39:43 +00:00
Merge branch 'cs-icon-fix' into 'master'
Add OpenMW-CS RC file to app rather than static lib See merge request OpenMW/openmw!3740
This commit is contained in:
commit
1bccd8483f
1 changed files with 4 additions and 1 deletions
|
@ -1,5 +1,4 @@
|
|||
set (OPENCS_SRC
|
||||
${CMAKE_SOURCE_DIR}/files/windows/opencs.rc
|
||||
)
|
||||
|
||||
opencs_units (. editor)
|
||||
|
@ -146,6 +145,9 @@ source_group (openmw-cs FILES main.cpp ${OPENCS_SRC} ${OPENCS_HDR})
|
|||
|
||||
if(WIN32)
|
||||
set(QT_USE_QTMAIN TRUE)
|
||||
set(OPENCS_RC_FILE ${CMAKE_SOURCE_DIR}/files/windows/opencs.rc)
|
||||
else(WIN32)
|
||||
set(OPENCS_RC_FILE "")
|
||||
endif(WIN32)
|
||||
|
||||
if (QT_VERSION_MAJOR VERSION_EQUAL 5)
|
||||
|
@ -186,6 +188,7 @@ if(BUILD_OPENCS)
|
|||
${OPENCS_CFG}
|
||||
${OPENCS_DEFAULT_FILTERS_FILE}
|
||||
${OPENCS_OPENMW_CFG}
|
||||
${OPENCS_RC_FILE}
|
||||
main.cpp
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in a new issue