From c89755b2a5a854895a9cc9a9bbbff07e264a501d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 12 Oct 2018 21:47:18 +0300 Subject: [PATCH] Define variables if not defined when include . (grafted from d21cb1805ca0aa448f9aec0b8cdd30c0b67a5b12) --HG-- branch : develop --- src/app/tape/share/resources/tape.rc | 29 ++++++++++++++++++- .../valentina/share/resources/valentina.rc | 27 +++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/src/app/tape/share/resources/tape.rc b/src/app/tape/share/resources/tape.rc index 18ff490a7..7e2d599e8 100644 --- a/src/app/tape/share/resources/tape.rc +++ b/src/app/tape/share/resources/tape.rc @@ -7,6 +7,33 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION PRODUCTVERSION VER_PRODUCTVERSION +// normally found in included by +// FILEFLAGS +#define VS_FF_NORMAL 0x00000000L // ok I made this one up +#ifndef VS_FF_DEBUG +#define VS_FF_DEBUG 0x00000001L +#endif +#ifndef VS_FF_PRERELEASE +#define VS_FF_PRERELEASE 0x00000002L +#endif +// FILEOS +#ifndef VOS_NT +#define VOS_NT 0x00040000L +#endif +#ifndef VOS__WINDOWS32 +#define VOS__WINDOWS32 0x00000004L +#endif +#ifndef VOS_NT_WINDOWS32 +#define VOS_NT_WINDOWS32 0x00040004L +#endif +// FILETYPE +#ifndef VFT_APP +#define VFT_APP 0x00000001L +#endif +#ifndef VFT_DLL +#define VFT_DLL 0x00000002L +#endif + #ifdef V_PRERELEASE #ifdef V_NO_DEBUG @@ -25,7 +52,7 @@ PRODUCTVERSION VER_PRODUCTVERSION #endif -FILEOS VOS__WINDOWS32 +FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP FILESUBTYPE VFT2_UNKNOWN BEGIN diff --git a/src/app/valentina/share/resources/valentina.rc b/src/app/valentina/share/resources/valentina.rc index 3ebabe9ff..43100acd2 100644 --- a/src/app/valentina/share/resources/valentina.rc +++ b/src/app/valentina/share/resources/valentina.rc @@ -7,6 +7,33 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION PRODUCTVERSION VER_PRODUCTVERSION +// normally found in included by +// FILEFLAGS +#define VS_FF_NORMAL 0x00000000L // ok I made this one up +#ifndef VS_FF_DEBUG +#define VS_FF_DEBUG 0x00000001L +#endif +#ifndef VS_FF_PRERELEASE +#define VS_FF_PRERELEASE 0x00000002L +#endif +// FILEOS +#ifndef VOS_NT +#define VOS_NT 0x00040000L +#endif +#ifndef VOS__WINDOWS32 +#define VOS__WINDOWS32 0x00000004L +#endif +#ifndef VOS_NT_WINDOWS32 +#define VOS_NT_WINDOWS32 0x00040004L +#endif +// FILETYPE +#ifndef VFT_APP +#define VFT_APP 0x00000001L +#endif +#ifndef VFT_DLL +#define VFT_DLL 0x00000002L +#endif + #ifdef V_PRERELEASE #ifdef V_NO_DEBUG