Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2015-01-23 19:02:59 +0300
committerMikkel Krautz <mikkel@krautz.dk>2015-04-22 22:03:39 +0300
commit3a6c4f0fee7b1d56b9cef25d422833c7c6633dd8 (patch)
tree4d5bb80a614ac03181b77fa5092094f9167a0df2 /3rdparty/minhook-build
parent4a478f7f04d11dcda7a63c4103830a555803f045 (diff)
Build two separate Windows overlays - one for x86 and one for x86_64.
This splits fx11 into an x86 variant and an x64 variant. This creates effects11_x86.lib and effects11_x64.lib, instead of the single effects11.lib we had previously. The minhook build is also tweaked. However, since minhook is only used on x86_64, it is only built for x86_64. Consequently, the library is still called minhook.lib. The overlay itself is split into mumble_ol.dll and mumble_ol.exe for x86, and mumble_ol_x64.dll and mumble_ol_x64.exe for x86_64.
Diffstat (limited to '3rdparty/minhook-build')
-rw-r--r--3rdparty/minhook-build/minhook-build.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/3rdparty/minhook-build/minhook-build.pro b/3rdparty/minhook-build/minhook-build.pro
index d517db62c..e68739175 100644
--- a/3rdparty/minhook-build/minhook-build.pro
+++ b/3rdparty/minhook-build/minhook-build.pro
@@ -1,3 +1,4 @@
+CONFIG += force-x86_64-toolchain
include(../../compiler.pri)
BUILDDIR=$$basename(PWD)