Commit Graph

24 Commits

Author SHA1 Message Date
Davide Beatrici
9ab5fe97b6 Set target macOS version to 10.9
"libstdc++" was deprecated with Xcode 8 and is not supported in Xcode 10.

The new library is "libc++", available with macOS 10.9+.

https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
2019-10-09 23:35:41 +02:00
Jan Klass
5fe390a0e4 Add missing ssleay32 library reference in openssl qmake configuration
MumbleSSL (defined in SSL.h/.cpp) uses OpenSSL functions - starting with
SSL_library_init. These functions are defined in the ssleay32 library.

This library was missing, which resulted/could result in linker errors
(in specific kinds of build environments).
2019-03-17 01:08:32 +01:00
Davide Beatrici
c176974ea3
Merge PR #3589: Crossbuild fix 2019-01-26 21:07:59 +01:00
Chris Knadle
4e024a2b06 qmake/pkgconfig.pri: Update to allow building with Qt4 2019-01-26 19:34:40 +00:00
Davide Beatrici
b427333257 Auto-update LICENSE.header in source files 2019-01-25 04:56:19 +01:00
Chris Knadle
50e5a2b7f3 qmake/compiler.pri: use PKG_CONFIG instead of hardcoding call to pkg-config
Patch supplied by Helmut Grohne <helmut@subdivi.de> in Debian bug #919453
https://bugs.debian.org/919453

Use set variable PKG_CONIFG to allow calling the pkg-config for the
architecture supplied in the build environment to allow cross building.
2019-01-19 05:38:06 +00:00
Chris Knadle
40ba488547 qmake/pkgconfig.pri: set PKG_CONFIG to allow making package cross buildable
Patch supplied by Helmut Grohne <helmut@subdivi.de> in Debian bug #919453
https://bugs.debian.org/919453

Instead of calling pkg-config directly, this patch calls pkgConfigExecutable()
from Qt5 to allow setting which pkg-config to be the one the user supplied
for the build to set the architecture to build with.
2019-01-19 05:26:22 +00:00
davidebeatrici
696e968d80 qmake: set custom build folders globally, with separated directories for each build file type 2018-02-18 23:56:29 +01:00
Mikkel Krautz
f6ba3a52bf Auto-update LICENSE.header in source files. 2018-01-01 23:05:37 +01:00
Mikkel Krautz
da3222d721 qmake/compiler.pri: target macOS 10.8 when building against Qt 5.10 or above.
Qt 5.10 uses features available only on macOS 10.8, such as
std::future<void>.

See the referenced issue for more information.

Fixes mumble-voip/mumble#3288
2017-12-31 01:39:49 +01:00
Mikkel Krautz
e3460f67d5 qmake/compiler.pri: add CONFIG(dpkg-buildflags).
Shelling out to dpkg-buildflags to get the preferred build flags
is now the way to go on Debian.

Previously, our PPA packages used hardening-wrapper to pass the
proper hardening flags to the package. That package is no longer
available in Debian unstable or Ubuntu zesty. To remedy that situation,
we have to add flags ourselves via dpkg-buildflags.

This commit implements a new CONFIG flag, CONFIG(dpkg-buildflags)
which will query dpkg-buildflags and append the retrieved CFLAGS,
CXXFLAGS, CPPFLAGS and LDFLAGS to QMAKE_CFLAGS, QMAKE_CXXFLAGS,
QMAKE_CPPFLAGS, QMAKE_LDFLAGS to ensure they are used in the Mumble
build.
2017-04-17 14:10:42 +02:00
Mikkel Krautz
029f0b8fc9 qmake/protobuf.pri: new file to include in .pro files for depending on protobuf.
This introduces a protobuf.pri helper that .pro files can include to
depend on protobuf.

Including protobuf.pri will link against the protobuf library, and include
the proper headers.
2017-03-26 22:21:25 +02:00
Mikkel Krautz
a58815c7a7 qmake/compiler.pri: fix value of MUMBLE_ARCH on Qt 5.
The MinGW PR changed MUMBLE_ARCH to use QT_ARCH on Qt 5.
However, QT_ARCH uses 'i386' for 32-bit x86, we're currently
using 'x86' throughout our .pro files.
To fix this problem, we map 'i386' back to 'x86'.

This is currently breaking the win32-static (x86) build.
2017-03-18 10:11:04 +01:00
Davide Beatrici
b6740369cf compiler.pri: Use the Unix block for win32-g++ too
So that we use the G++ features when compiling with MinGW.
2017-03-17 19:14:21 +01:00
Davide Beatrici
d8a165b05f openssl.pri: Link against "libssl", "libcrypto" and "gdi32" when targetting MinGWi 2017-03-17 19:14:17 +01:00
Davide Beatrici
5754a097ab compiler.pri: Enable SSE and SSE2 for MinGW 2017-03-17 19:14:17 +01:00
Davide Beatrici
45a40bfbfb compiler.pri: Define "MINGW_HAS_SECURE_API" to enable secure functions
MXE's MinGW has the secure functions disabled by default, because their headers check if "MINGW_HAS_SECURE_API" is defined.
2017-03-17 19:14:17 +01:00
Davide Beatrici
67422bc853 compiler.pri: Add CONFIG(symbols) support to win32-g++ build. 2017-03-17 19:14:17 +01:00
Davide Beatrici
886098b416 compiler.pri: Use QT_ARCH instead of QMAKE_target.arch with Qt 5
QMAKE_target.arch doesn't return "x86_64" with MinGW x64.
2017-03-17 19:14:16 +01:00
Davide Beatrici
0fdbb5ded3 rcc.pri: Fix wrong script path
The path has changed with PR #2905.
2017-03-05 19:35:50 +01:00
Davide Beatrici
d04995899a Move .pri files and "toolchain" folder in "qmake" 2017-03-05 15:48:16 +01:00
Mikkel Krautz
d1454a194f qmake/openssl.pri: link against gdi32.dll. 2017-02-28 01:04:18 +01:00
Mikkel Krautz
939f6f1c7b qmake/openssl.pri: when using OpenSSL via pkgconfig, ensure link_pkgconfig is in CONFIG.
This fixes a problem I encountered where including openssl.pri
in TestCryptographicHash.pro on Qt 4 wouldn't link OpenSSL.

This commit fixes that problem by ensuring link_pkgconfig is
always included in CONFIG when openssl.pri uses pkgconfig.
2017-02-25 23:02:23 +01:00
Mikkel Krautz
6329ed7cd1 mumble.pri: split out OpenSSL depenency lookup into qmake/openssl.pri for easier use in tests.
This is needed to be able to add tests that depend on OpenSSL.
2017-02-23 23:22:30 +01:00