From 6d12374ace045ea20ee1dded0fa7f02d78d8c2ca Mon Sep 17 00:00:00 2001 From: cc9cii Date: Fri, 5 Sep 2014 22:36:33 +1000 Subject: [PATCH] Move windows platform specific files into a common directory. --- apps/launcher/CMakeLists.txt | 2 +- apps/opencs/CMakeLists.txt | 2 +- apps/openmw/CMakeLists.txt | 2 +- files/launcher/launcher.rc | 1 - files/openmw/openmw.rc | 1 - files/windows/launcher.rc | 1 + files/{opencs => windows}/opencs.ico | Bin files/{opencs => windows}/opencs.rc | 0 files/{launcher/images => windows}/openmw.ico | Bin files/windows/openmw.rc | 1 + 10 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 files/launcher/launcher.rc delete mode 100644 files/openmw/openmw.rc create mode 100644 files/windows/launcher.rc rename files/{opencs => windows}/opencs.ico (100%) rename files/{opencs => windows}/opencs.rc (100%) rename files/{launcher/images => windows}/openmw.ico (100%) create mode 100644 files/windows/openmw.rc diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt index d7733ba0e..4051480c7 100644 --- 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) diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt index 885b65365..8afcc9795 100644 --- a/apps/opencs/CMakeLists.txt +++ b/apps/opencs/CMakeLists.txt @@ -1,5 +1,5 @@ set (OPENCS_SRC main.cpp - ${CMAKE_SOURCE_DIR}/files/opencs/opencs.rc + ${CMAKE_SOURCE_DIR}/files/windows/opencs.rc ) opencs_units (. editor) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index e2c1ef5c9..d4859b668 100644 --- 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) diff --git a/files/launcher/launcher.rc b/files/launcher/launcher.rc deleted file mode 100644 index df2121f46..000000000 --- a/files/launcher/launcher.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "images/openmw.ico" diff --git a/files/openmw/openmw.rc b/files/openmw/openmw.rc deleted file mode 100644 index 325c182c3..000000000 --- a/files/openmw/openmw.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "../launcher/images/openmw.ico" diff --git a/files/windows/launcher.rc b/files/windows/launcher.rc new file mode 100644 index 000000000..b879a7dd5 --- /dev/null +++ b/files/windows/launcher.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "openmw.ico" diff --git a/files/opencs/opencs.ico b/files/windows/opencs.ico similarity index 100% rename from files/opencs/opencs.ico rename to files/windows/opencs.ico diff --git a/files/opencs/opencs.rc b/files/windows/opencs.rc similarity index 100% rename from files/opencs/opencs.rc rename to files/windows/opencs.rc diff --git a/files/launcher/images/openmw.ico b/files/windows/openmw.ico similarity index 100% rename from files/launcher/images/openmw.ico rename to files/windows/openmw.ico diff --git a/files/windows/openmw.rc b/files/windows/openmw.rc new file mode 100644 index 000000000..b879a7dd5 --- /dev/null +++ b/files/windows/openmw.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "openmw.ico"