feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Define _WIN32_WCE if using the MSVC for Windows CE compiler.

Browse Source 
Also, remove bogus default defines.

Reviewed-By: joerg
This commit is contained in:
Daniel Molkentin
2009-10-15 16:32:38 +02:00
parent 594da3a37e
commit 1da8ccae81
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -314,8 +314,8 @@ QByteArray msvcCompilationFile() {
"_MSC_FULL_VER","_MSC_VER","__MSVC_RUNTIME_CHECKS", "_MSC_FULL_VER","_MSC_VER","__MSVC_RUNTIME_CHECKS",
"_MT", "_NATIVE_WCHAR_T_DEFINED", "_OPENMP", "_MT", "_NATIVE_WCHAR_T_DEFINED", "_OPENMP",
"_VC_NODEFAULTLIB", "_WCHAR_T_DEFINED", "_WIN32", "_VC_NODEFAULTLIB", "_WCHAR_T_DEFINED", "_WIN32",
"_WIN64", "_Wp64", "__DATE__", "__DATE__", "_WIN32_WCE", "_WIN64", "_Wp64", "__DATE__",
"__TIME__", "__TIMESTAMP__", "__DATE__", "__TIME__", "__TIMESTAMP__",
0}; 0};
QByteArray file = "#define __PPOUT__(x) V##x=x\n\n"; QByteArray file = "#define __PPOUT__(x) V##x=x\n\n";
int i =0; int i =0;
@@ -333,9 +333,6 @@ QByteArray MSVCToolChain::predefinedMacros()
{ {
if (m_predefinedMacros.isEmpty()) { if (m_predefinedMacros.isEmpty()) {
m_predefinedMacros += "#define __MSVCRT__\n" m_predefinedMacros += "#define __MSVCRT__\n"
"#define __WINNT__\n"
"#define __WINNT\n"
"#define WINNT\n"
"#define __int64 long long\n" "#define __int64 long long\n"
"#define __int32 long\n" "#define __int32 long\n"
"#define __int16 short\n" "#define __int16 short\n"