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

10 years ago · 5dd424b6c6
parent b5d5eadf79 6d12374ace
commit 5dd424b6c6
10 changed files with 8 additions and 5 deletions
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@ -15,7 +15,7 @@ set(LAUNCHER
    utils/textinputdialog.cpp
    utils/lineedit.cpp

-    ${CMAKE_SOURCE_DIR}/files/launcher/launcher.rc
+    ${CMAKE_SOURCE_DIR}/files/windows/launcher.rc
 )
 if(NOT WIN32)
    LIST(APPEND LAUNCHER unshieldthread.cpp)
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@ -1,4 +1,6 @@
-set (OPENCS_SRC main.cpp)
+set (OPENCS_SRC main.cpp
+    ${CMAKE_SOURCE_DIR}/files/windows/opencs.rc
+    )

 opencs_units (. editor)

--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@ -3,7 +3,7 @@ set(GAME
    main.cpp
    engine.cpp

-    ${CMAKE_SOURCE_DIR}/files/openmw/openmw.rc
+    ${CMAKE_SOURCE_DIR}/files/windows/openmw.rc
 )

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