diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 397c427a3..d81630376 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -115,7 +115,7 @@ if(APPLE) add_custom_command(TARGET vcmiclient POST_BUILD COMMAND ${MakeVCMIBundle}) elseif(WIN32) - add_executable(vcmiclient ${client_SRCS} VCMI_client.mingw.rc) + add_executable(vcmiclient ${client_SRCS} VCMI_client.rc) else() add_executable(vcmiclient ${client_SRCS}) endif() diff --git a/client/VCMI_client.mingw.rc b/client/VCMI_client.mingw.rc deleted file mode 100644 index f901de682..000000000 --- a/client/VCMI_client.mingw.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON "vcmi.ico" \ No newline at end of file diff --git a/client/VCMI_client.rc b/client/VCMI_client.rc index 209710ee5..f901de682 100644 --- a/client/VCMI_client.rc +++ b/client/VCMI_client.rc @@ -1,72 +1 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winresrc.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Polish resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK) -#ifdef _WIN32 -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "vcmi.ico" -#endif // Polish resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +IDI_ICON1 ICON "vcmi.ico" \ No newline at end of file diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 97401251e..efe5efea4 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} VCMI_launcher.mingw.rc) + add_executable(vcmilauncher WIN32 ${launcher_SRCS} ${launcher_UI_HEADERS} VCMI_launcher.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 deleted file mode 100644 index 0ab86661d..000000000 --- a/launcher/VCMI_launcher.mingw.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON "../client/vcmi.ico" \ No newline at end of file diff --git a/launcher/VCMI_launcher.rc b/launcher/VCMI_launcher.rc index 3fd41b0bc..9fb0b7833 100644 Binary files a/launcher/VCMI_launcher.rc and b/launcher/VCMI_launcher.rc differ