Commit 555436bc authored by kh1's avatar kh1
Browse files

Fix the build using mingw 4.4.0

parent 83a5aced
...@@ -9,7 +9,11 @@ ...@@ -9,7 +9,11 @@
#define BOTAN_VERSION_PATCH 8 #define BOTAN_VERSION_PATCH 8
#ifndef BOTAN_DLL #ifndef BOTAN_DLL
#define BOTAN_DLL __declspec(dllexport) # if !defined(Q_CC_MINGW)
# define BOTAN_DLL __declspec(dllexport)
# else
# define BOTAN_DLL
# endif
#endif #endif
/* Chunk sizes */ /* Chunk sizes */
...@@ -40,12 +44,15 @@ ...@@ -40,12 +44,15 @@
#define BOTAN_TARGET_OS_IS_WINDOWS #define BOTAN_TARGET_OS_IS_WINDOWS
#define BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK #define BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK
#define BOTAN_TARGET_ARCH_IS_IA64
#define BOTAN_TARGET_UNALIGNED_LOADSTOR_OK 0
/* Module definitions */ /* 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_ADLER32
#define BOTAN_HAS_AES #define BOTAN_HAS_AES
#define BOTAN_HAS_ALGORITHM_FACTORY #define BOTAN_HAS_ALGORITHM_FACTORY
...@@ -174,18 +181,11 @@ ...@@ -174,18 +181,11 @@
#define BOTAN_HAS_XTEA #define BOTAN_HAS_XTEA
#define BOTAN_HAS_XTS #define BOTAN_HAS_XTS
/* Local configuration options */ /* 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 Modules
------- -------
adler32 (Adler32) adler32 (Adler32)
......
...@@ -9,12 +9,15 @@ DEPENDPATH += . ...@@ -9,12 +9,15 @@ DEPENDPATH += .
INCLUDEPATH += $$PWD $$PWD/../build $$PWD/../build/botan INCLUDEPATH += $$PWD $$PWD/../build $$PWD/../build/botan
win32 { 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 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 { unix {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment