diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2017-03-17 23:02:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 23:02:17 +0300 |
| commit | 10079ed9867308aad098231f86e260bd831b0ac6 (patch) | |
| tree | d6aafcd7f2f47fc9f210bd415b89698fd618a163 /qmake | |
| parent | 8758cf5a9947ecfdfe286596d43824dc1a5df786 (diff) | |
| parent | cb1c1b40b8df1b06367232b70df5d606b0541eae (diff) | |
Merge PR #2907: Implement support for building Mumble and Murmur using the MinGW toolchain.
This pull request implements support for building Mumble and Murmur with the MinGW toolchain.
Both x86 and x86_64 targets are supported, and most features work.
For now, we use, and test against MXE (http://www.mxe.cc).
The PR also implements a Linux-based cross-build of Mumble and Murmur on Travis CI. This environment uses Wine as a test runner.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/compiler.pri | 23 | ||||
| -rw-r--r-- | qmake/openssl.pri | 6 |
2 files changed, 26 insertions, 3 deletions
diff --git a/qmake/compiler.pri b/qmake/compiler.pri index 26e556904..f23beebea 100644 --- a/qmake/compiler.pri +++ b/qmake/compiler.pri @@ -24,8 +24,27 @@ QMAKE_RESOURCE_FLAGS += -compress 9 # QMAKE_TARGET.arch doesn't suffice any longer, and # we define MUMBLE_ARCH to be used in its place. MUMBLE_ARCH = $$QMAKE_TARGET.arch +# When using Qt 5, use QT_ARCH instead of QMAKE_TARGET. +# It also works for cross-builds. +isEqual(QT_MAJOR_VERSION, 5) { + MUMBLE_ARCH = $$QT_ARCH +} + +win32-g++ { + DEFINES *= MINGW_HAS_SECURE_API + + # Enable SSE + QMAKE_CFLAGS *= -msse -msse2 + QMAKE_CXXFLAGS *= -msse -msse2 + + CONFIG(symbols) { + # Configure build to be able to properly debug release builds + QMAKE_CFLAGS *= -g + QMAKE_CXXFLAGS *= -g + } +} -win32 { +win32-msvc* { # Define the CONFIG options 'force-x86-toolchain' and # 'force-x86_64-toolchain'. These can be used to force # the target of a .pro file to be built for a specific @@ -189,7 +208,7 @@ win32 { } } -unix { +unix|win32-g++ { DEFINES *= RESTRICT=__restrict__ QMAKE_CFLAGS *= -fvisibility=hidden QMAKE_CXXFLAGS *= -fvisibility=hidden diff --git a/qmake/openssl.pri b/qmake/openssl.pri index 5ca7c5c55..71a504040 100644 --- a/qmake/openssl.pri +++ b/qmake/openssl.pri @@ -13,12 +13,16 @@ include(pkgconfig.pri) # This file can't include compiler.pri: it can # only be included once per .pro file. -win32 { +win32-msvc* { INCLUDEPATH *= "$$OPENSSL_PATH/include" QMAKE_LIBDIR *= "$$OPENSSL_PATH/lib" LIBS *= -lgdi32 -llibeay32 } +win32-g++ { + LIBS *= -lssl -lcrypto -lgdi32 +} + unix { contains(UNAME, FreeBSD) { LIBS *= -lcrypto -lssl |