From 555436bc0f3c3d221c31aa155d406a8a5a7a3928 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Wed, 10 Feb 2010 18:30:23 +0100
Subject: [PATCH] Fix the build using mingw 4.4.0
---
.../botan/build/botan/build_windows.h | 28 +++++++++----------
src/libs/3rdparty/botan/src/src.pro | 13 +++++----
2 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/src/libs/3rdparty/botan/build/botan/build_windows.h b/src/libs/3rdparty/botan/build/botan/build_windows.h
index e4bc6c6a0bb..8e9bc038b4a 100644
--- a/src/libs/3rdparty/botan/build/botan/build_windows.h
+++ b/src/libs/3rdparty/botan/build/botan/build_windows.h
@@ -9,7 +9,11 @@
#define BOTAN_VERSION_PATCH 8
#ifndef BOTAN_DLL
- #define BOTAN_DLL __declspec(dllexport)
+# if !defined(Q_CC_MINGW)
+# define BOTAN_DLL __declspec(dllexport)
+# else
+# define BOTAN_DLL
+# endif
#endif
/* Chunk sizes */
@@ -40,12 +44,15 @@
#define BOTAN_TARGET_OS_IS_WINDOWS
#define BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK
-#define BOTAN_TARGET_ARCH_IS_IA64
-#define BOTAN_TARGET_UNALIGNED_LOADSTOR_OK 0
-
-
-
/* Module definitions */
+#if defined(Q_CC_MINGW)
+# define BOTAN_USE_STD_TR1
+# define BOTAN_HAS_BIGINT_GFP
+# define BOTAN_HAS_CARD_VERIFIABLE_CERTIFICATES
+# define BOTAN_HAS_ECC_DOMAIN_PARAMATERS
+# define BOTAN_HAS_ECC_PUBLIC_KEY_CRYPTO
+#endif
+
#define BOTAN_HAS_ADLER32
#define BOTAN_HAS_AES
#define BOTAN_HAS_ALGORITHM_FACTORY
@@ -174,18 +181,11 @@
#define BOTAN_HAS_XTEA
#define BOTAN_HAS_XTS
+
/* Local configuration options */
/*
-kheimric@deepburner ran 'E:\dev\creator\src\libs\3rdparty\botan\configure.py --cc=msvc --os=windows --cpu=ia64 --disable-asm'
-
-Target
--------
-Compiler: cl.exe /O2
-Arch: ia64/ia64
-OS: windows
-
Modules
-------
adler32 (Adler32)
diff --git a/src/libs/3rdparty/botan/src/src.pro b/src/libs/3rdparty/botan/src/src.pro
index fece464ab7b..879880d9a17 100644
--- a/src/libs/3rdparty/botan/src/src.pro
+++ b/src/libs/3rdparty/botan/src/src.pro
@@ -9,12 +9,15 @@ DEPENDPATH += .
INCLUDEPATH += $$PWD $$PWD/../build $$PWD/../build/botan
win32 {
+ win32-msvc* {
+ QMAKE_CXXFLAGS += -wd4251 -wd4290
+ DEFINES += _CRT_SECURE_NO_WARNINGS
+ DEFINES += BOTAN_DLL=__declspec(dllexport)
+ } else {
+ QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long
+ QMAKE_CXXFLAGS += -fpermissive -finline-functions -Wno-long-long
+ }
LIBS += -ladvapi32 -luser32
- win32-msvc*: QMAKE_CXXFLAGS += -wd4251 -wd4290
-
- DEFINES += _CRT_SECURE_NO_WARNINGS
- DEFINES += BOTAN_USE_WINDOWS_BUILD_H
- DEFINES += BOTAN_DLL=__declspec(dllexport)
}
unix {
--
GitLab