diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:20:29 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:20:29 +0200 |
| commit | b8f13e45be884dc12884ebe8f3dcd9eecb23a106 (patch) | |
| tree | 22a6d8b96815d626061ff3e2d432c13078fca5c4 /resource.rc | |
| parent | 5.4 (diff) | |
| download | FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.tar.gz FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.tar.bz2 FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.zip | |
5.5
Diffstat (limited to 'resource.rc')
| -rw-r--r-- | resource.rc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/resource.rc b/resource.rc index 093036e9..e4675de4 100644 --- a/resource.rc +++ b/resource.rc @@ -1,9 +1,15 @@ #define IDR_VERSION1 1 -#include "Winver.h" -#include "wx/msw/wx.rc" +#include <Winver.h> #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 <wx/msw/wx.rc> A_PROGRAM_ICON ICON DISCARDABLE "lib/FreeFileSync.ico" B_BATCH_ICON ICON DISCARDABLE "lib/Batch.ico" |