Merge remote-tracking branch 'cc9cii/Bug-No-1655'

forked from mirror/openmw-tes3mp
10 years ago · 86995adc4a
parent 71a2424500 e0e561a105
commit 86995adc4a
2 changed files with 3 additions and 0 deletions
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@ -2,6 +2,8 @@
 set(GAME
    main.cpp
    engine.cpp
+
+    ${CMAKE_SOURCE_DIR}/files/openmw/openmw.rc
 )

 if (ANDROID)
--- a/files/openmw/openmw.rc
+++ b/files/openmw/openmw.rc
@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "../launcher/images/openmw.ico"
				`@ -0,0 +1 @@`
				`IDI_ICON1 ICON DISCARDABLE "../launcher/images/openmw.ico"`