From 6a239606429e124b5910f3802d8f5ad05465a111 Mon Sep 17 00:00:00 2001 From: Michael Pavlyshko Date: Mon, 14 Jul 2014 01:02:00 +0300 Subject: [PATCH] CMake/WIN32 : add icon to client and launcher --- client/CMakeLists.txt | 2 ++ client/VCMI_client.mingw.rc | 1 + launcher/CMakeLists.txt | 2 +- launcher/VCMI_launcher.mingw.rc | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 client/VCMI_client.mingw.rc create mode 100644 launcher/VCMI_launcher.mingw.rc diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 785095a27..079a8392b 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -97,6 +97,8 @@ if(APPLE) cp -r ${CMAKE_HOME_DIRECTORY}/launcher/icons/ ${BUNDLE_PATH}/Data/launcher/icons/) add_custom_command(TARGET vcmiclient POST_BUILD COMMAND ${MakeVCMIBundle}) +elseif(WIN32) + add_executable(vcmiclient ${client_SRCS} VCMI_client.mingw.rc) else() add_executable(vcmiclient ${client_SRCS}) endif() diff --git a/client/VCMI_client.mingw.rc b/client/VCMI_client.mingw.rc new file mode 100644 index 000000000..f901de682 --- /dev/null +++ b/client/VCMI_client.mingw.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON "vcmi.ico" \ No newline at end of file diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 9bc5ca2d8..97401251e 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -52,7 +52,7 @@ set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS} ${CMAKE_CXX_FLAGS}") qt5_wrap_ui(launcher_UI_HEADERS ${launcher_FORMS}) if(WIN32) - add_executable(vcmilauncher WIN32 ${launcher_SRCS} ${launcher_UI_HEADERS}) + add_executable(vcmilauncher WIN32 ${launcher_SRCS} ${launcher_UI_HEADERS} VCMI_launcher.mingw.rc) set_target_properties(vcmilauncher PROPERTIES OUTPUT_NAME VCMI_launcher) else() add_executable(vcmilauncher ${launcher_SRCS} ${launcher_UI_HEADERS}) diff --git a/launcher/VCMI_launcher.mingw.rc b/launcher/VCMI_launcher.mingw.rc new file mode 100644 index 000000000..0ab86661d --- /dev/null +++ b/launcher/VCMI_launcher.mingw.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON "../client/vcmi.ico" \ No newline at end of file