1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00

don't use separate .rc files for MSVC and MinGW

This commit is contained in:
Mikhail Paulyshka 2014-10-12 16:32:02 +03:00
parent 7eff144a9f
commit ab5e1f9109
6 changed files with 3 additions and 76 deletions

View File

@ -115,7 +115,7 @@ if(APPLE)
add_custom_command(TARGET vcmiclient POST_BUILD COMMAND ${MakeVCMIBundle}) add_custom_command(TARGET vcmiclient POST_BUILD COMMAND ${MakeVCMIBundle})
elseif(WIN32) elseif(WIN32)
add_executable(vcmiclient ${client_SRCS} VCMI_client.mingw.rc) add_executable(vcmiclient ${client_SRCS} VCMI_client.rc)
else() else()
add_executable(vcmiclient ${client_SRCS}) add_executable(vcmiclient ${client_SRCS})
endif() endif()

View File

@ -1 +0,0 @@
IDI_ICON1 ICON "vcmi.ico"

View File

@ -1,72 +1 @@
// Microsoft Visual C++ generated resource script. IDI_ICON1 ICON "vcmi.ico"
//
#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

View File

@ -52,7 +52,7 @@ set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS} ${CMAKE_CXX_FLAGS}")
qt5_wrap_ui(launcher_UI_HEADERS ${launcher_FORMS}) qt5_wrap_ui(launcher_UI_HEADERS ${launcher_FORMS})
if(WIN32) 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) set_target_properties(vcmilauncher PROPERTIES OUTPUT_NAME VCMI_launcher)
else() else()
add_executable(vcmilauncher ${launcher_SRCS} ${launcher_UI_HEADERS}) add_executable(vcmilauncher ${launcher_SRCS} ${launcher_UI_HEADERS})

View File

@ -1 +0,0 @@
IDI_ICON1 ICON "../client/vcmi.ico"

Binary file not shown.