From b8f13e45be884dc12884ebe8f3dcd9eecb23a106 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:20:29 +0200 Subject: 5.5 --- RealtimeSync/resource.rc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'RealtimeSync/resource.rc') diff --git a/RealtimeSync/resource.rc b/RealtimeSync/resource.rc index bad326e1..8716dabd 100644 --- a/RealtimeSync/resource.rc +++ b/RealtimeSync/resource.rc @@ -1,9 +1,16 @@ #define IDR_VERSION1 1 -#include "Winver.h" -#include "wx/msw/wx.rc" +#include #include "../version/version.rc" +//beginning with VC11 we get linking error "CVTRES : fatal error CVT1100: duplicate resource. type:MANIFEST, name:1, language:0x0409" +//due to "#define wxMANIFEST_ID 1" in wx.rc. Using another number doesn't integrate the manifest correctly for VC2010 compilers. +//However tests indicate we do not need this manifest at all: +//#define wxUSE_NO_MANIFEST 1 //VC11 screws up if not set to an integer, unbelievable +//we can't #ifdef _MSC_VER: not known by resource compiler! +//see also: http://blog.m-ri.de/index.php/2010/11/26/combobox-dropdown-hoehe-wird-nicht-mehr-durch-die-ressourcen-definiert/ +#include + A_PROGRAM_ICON ICON DISCARDABLE "RealtimeSync.ico" IDR_VERSION1 VERSIONINFO -- cgit