mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:23:52 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Marc Zinnschlag 2014-09-11 14:14:02 +02:00
commit 5dd424b6c6
10 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/launcher/CMakeLists.txt
View file

@ -15,7 +15,7 @@ set(LAUNCHER
utils/textinputdialog.cpp utils/textinputdialog.cpp
utils/lineedit.cpp utils/lineedit.cpp
${CMAKE_SOURCE_DIR}/files/launcher/launcher.rc ${CMAKE_SOURCE_DIR}/files/windows/launcher.rc
) )
if(NOT WIN32) if(NOT WIN32)
LIST(APPEND LAUNCHER unshieldthread.cpp) LIST(APPEND LAUNCHER unshieldthread.cpp)

4
apps/opencs/CMakeLists.txt
View file

@ -1,4 +1,6 @@
set (OPENCS_SRC main.cpp) set (OPENCS_SRC main.cpp
${CMAKE_SOURCE_DIR}/files/windows/opencs.rc
)
opencs_units (. editor) opencs_units (. editor)

2
apps/openmw/CMakeLists.txt
View file

@ -3,7 +3,7 @@ set(GAME
main.cpp main.cpp
engine.cpp engine.cpp
${CMAKE_SOURCE_DIR}/files/openmw/openmw.rc ${CMAKE_SOURCE_DIR}/files/windows/openmw.rc
) )
if (ANDROID) if (ANDROID)

1
files/launcher/launcher.rc
View file

@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "images/openmw.ico"

1
files/openmw/openmw.rc
View file

@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "../launcher/images/openmw.ico"

1
files/windows/launcher.rc Normal file
View file

@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "openmw.ico"

BIN
files/windows/opencs.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 361 KiB

1
files/windows/opencs.rc Normal file
View file

@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "opencs.ico"

0
files/launcher/images/openmw.ico → files/windows/openmw.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

1
files/windows/openmw.rc Normal file
View file

@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "openmw.ico"