From 1da8ccae81b5a3dd896c9f6aa63ba82bb5586041 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Thu, 15 Oct 2009 16:32:38 +0200
Subject: [PATCH] Define _WIN32_WCE if using the MSVC for Windows CE compiler.
Also, remove bogus default defines.
Reviewed-By: joerg
---
src/plugins/projectexplorer/toolchain.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 9f680ac2742..7626445a8de 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -314,8 +314,8 @@ QByteArray msvcCompilationFile() {
"_MSC_FULL_VER","_MSC_VER","__MSVC_RUNTIME_CHECKS",
"_MT", "_NATIVE_WCHAR_T_DEFINED", "_OPENMP",
"_VC_NODEFAULTLIB", "_WCHAR_T_DEFINED", "_WIN32",
- "_WIN64", "_Wp64", "__DATE__", "__DATE__",
- "__TIME__", "__TIMESTAMP__",
+ "_WIN32_WCE", "_WIN64", "_Wp64", "__DATE__",
+ "__DATE__", "__TIME__", "__TIMESTAMP__",
0};
QByteArray file = "#define __PPOUT__(x) V##x=x\n\n";
int i =0;
@@ -333,9 +333,6 @@ QByteArray MSVCToolChain::predefinedMacros()
{
if (m_predefinedMacros.isEmpty()) {
m_predefinedMacros += "#define __MSVCRT__\n"
- "#define __WINNT__\n"
- "#define __WINNT\n"
- "#define WINNT\n"
"#define __int64 long long\n"
"#define __int32 long\n"
"#define __int16 short\n"
--
GitLab