diff options
| author | davidebeatrici <davidebeatrici@gmail.com> | 2018-02-18 22:20:04 +0300 |
|---|---|---|
| committer | davidebeatrici <davidebeatrici@gmail.com> | 2018-02-19 01:56:34 +0300 |
| commit | 5477e8f9998e06fd485d595a4d9da216b4c9f82c (patch) | |
| tree | 06b5b1b8bd6f8e89ef1199d2282b486cb97d6933 /overlay | |
| parent | b0974d75f24b94daedfce868bde294feb5cb4a4a (diff) | |
overlay: set custom build directory in relation to the global one
Diffstat (limited to 'overlay')
| -rw-r--r-- | overlay/overlay-shared.pro | 10 | ||||
| -rw-r--r-- | overlay/overlay.pro | 4 | ||||
| -rw-r--r-- | overlay/overlay_exe/overlay_exe-shared.pro | 3 | ||||
| -rw-r--r-- | overlay/overlay_exe/overlay_exe.pro | 2 |
4 files changed, 7 insertions, 12 deletions
diff --git a/overlay/overlay-shared.pro b/overlay/overlay-shared.pro index 9d99cf250..65603f7f9 100644 --- a/overlay/overlay-shared.pro +++ b/overlay/overlay-shared.pro @@ -11,7 +11,6 @@ TEMPLATE = lib CONFIG -= qt CONFIG *= dll shared debug_and_release warn_on CONFIG -= embed_manifest_dll -TARGET = mumble_ol RC_FILE = mumble_ol.rc SOURCES = ancestor.cpp lib.cpp olsettings.cpp excludecheck.cpp d3d9.cpp dxgi.cpp d3d10.cpp d3d11.cpp ods.cpp opengl.cpp HardHook.cpp D11StateBlock.cpp HEADERS = ancestor.h lib.h olsettings.h excludecheck.h ods.h HardHook.h overlay_blacklist.h D11StateBlock.h ../3rdparty/GL/glext.h @@ -36,17 +35,12 @@ CONFIG(force-x86_64-toolchain) { LIBS *= -lminhook } -CONFIG(release, debug|release) { - DESTDIR = ../release - QMAKE_LIBDIR = ../release $$QMAKE_LIBDIR -} - CONFIG(debug, debug|release) { - DESTDIR = ../debug - QMAKE_LIBDIR = ../debug $$QMAKE_LIBDIR DEFINES *= DEBUG } +QMAKE_LIBDIR = $$DESTDIR $$QMAKE_LIBDIR + # Override fxc binary for the x86 build. CONFIG(force-x86-toolchain) { exists($$DXSDK_DIR) { diff --git a/overlay/overlay.pro b/overlay/overlay.pro index ed087353a..187cf5212 100644 --- a/overlay/overlay.pro +++ b/overlay/overlay.pro @@ -4,4 +4,6 @@ # Mumble source tree or at <https://www.mumble.info/LICENSE>. CONFIG += force-x86-toolchain -include(overlay-shared.pro)
\ No newline at end of file +TARGET = mumble_ol + +include(overlay-shared.pro) diff --git a/overlay/overlay_exe/overlay_exe-shared.pro b/overlay/overlay_exe/overlay_exe-shared.pro index 9525bf4af..284c30e32 100644 --- a/overlay/overlay_exe/overlay_exe-shared.pro +++ b/overlay/overlay_exe/overlay_exe-shared.pro @@ -8,7 +8,6 @@ include(../../qmake/compiler.pri) TEMPLATE = app CONFIG -= qt CONFIG += debug_and_release -TARGET = mumble_ol_helper win32 { DEFINES += WIN32 _WIN32 @@ -32,12 +31,10 @@ QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote(mt.exe -nologo CONFIG(debug, debug|release) { CONFIG += console DEFINES *= DEBUG - DESTDIR = ../../debug } CONFIG(release, debug|release) { DEFINES *= NDEBUG - DESTDIR = ../../release } include(../../qmake/symbols.pri) diff --git a/overlay/overlay_exe/overlay_exe.pro b/overlay/overlay_exe/overlay_exe.pro index 395bf0109..8cd4f465a 100644 --- a/overlay/overlay_exe/overlay_exe.pro +++ b/overlay/overlay_exe/overlay_exe.pro @@ -4,4 +4,6 @@ # Mumble source tree or at <https://www.mumble.info/LICENSE>. CONFIG += force-x86-toolchain +TARGET = mumble_ol_helper + include(overlay_exe-shared.pro) |