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

Teach Botan about the Intel compiler

Browse Source 
Change-Id: I44cf52568e0fdbde6935c6844874b39a37941c33
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Thiago Macieira
2012-08-10 12:15:29 +02:00
committed by Christian Kandeler
parent a54f9f1c54
commit 3094cc1dbd
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/3rdparty/botan/botan.cpp vendored
View File

@@ -46239,7 +46239,7 @@ namespace {
} }
#elif defined(BOTAN_TARGET_ARCH_IS_X86_64) && \ #elif defined(BOTAN_TARGET_ARCH_IS_X86_64) && \
(defined(BOTAN_BUILD_COMPILER_IS_CLANG) || defined(BOTAN_BUILD_COMPILER_IS_GCC)) (defined(BOTAN_BUILD_COMPILER_IS_CLANG) || defined(BOTAN_BUILD_COMPILER_IS_GCC) || defined(BOTAN_BUILD_COMPILER_IS_INTEL))
/* /*
* We can't safely use this on x86-32 as some 32-bit ABIs use ebx as * We can't safely use this on x86-32 as some 32-bit ABIs use ebx as

1
src/libs/3rdparty/botan/botan.pro vendored
View File

@@ -22,6 +22,7 @@ unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN
*g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC *g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC
*clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG *clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG
*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL
win32 { win32 {
DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \ DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \