From ce5882198e31be69722405c21d6e9d1ae51f33a2 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 24 Oct 2014 00:44:50 +0300 Subject: [PATCH] Build on Windows. --HG-- branch : develop --- src/app/core/vapplication.cpp | 1 + src/app/options.h | 8 ++++++-- src/app/share/resources/valentina.rc | 14 +------------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/app/core/vapplication.cpp b/src/app/core/vapplication.cpp index f3b75d5f1..ebd5ffea4 100644 --- a/src/app/core/vapplication.cpp +++ b/src/app/core/vapplication.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include #include diff --git a/src/app/options.h b/src/app/options.h index 089c81384..0afea395e 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -33,8 +33,12 @@ #include #ifdef Q_OS_WIN32 -#define NOMINMAX -# include +# if defined( Q_CC_MSVC ) // MSVC USED +# ifndef NOMINMAX +# define NOMINMAX // DISABLE min/max MACROS +# endif +# endif /*Q_CC_MSVC*/ +# include extern Q_CORE_EXPORT int qt_ntfs_permission_lookup; #endif /*Q_OS_WIN32*/ diff --git a/src/app/share/resources/valentina.rc b/src/app/share/resources/valentina.rc index 698adfd8b..61e183aca 100644 --- a/src/app/share/resources/valentina.rc +++ b/src/app/share/resources/valentina.rc @@ -29,18 +29,6 @@ BEGIN BLOCK "VarFileInfo" BEGIN - /* The following line should only be modified for localized versions. */ - /* It consists of any number of WORD,WORD pairs, with each pair */ - /* describing a language,codepage combination supported by the file. */ - /* */ - /* For example, a file might have values "0x409,1252" indicating that it */ - /* supports English language (0x409) in the Windows ANSI codepage (1252). */ - VALUE "Translation", 0x0409, 1252, //U.S. English - VALUE "Translation", 0x0405, 1200, //Czech - VALUE "Translation", 0x0407, 1200, //German - VALUE "Translation", 0x040C, 1200, //French - VALUE "Translation", 0x040D, 1200, //Hebrew - VALUE "Translation", 0x0413, 1200, //Dutch - VALUE "Translation", 0x0419, 1200 //Russian + VALUE "Translation", 0x0409, 0x04E4 //U.S. English END END