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:
authorRobert Adam <dev@robert-adam.de>2020-09-01 20:15:35 +0300
committerRobert Adam <dev@robert-adam.de>2020-09-02 09:29:45 +0300
commit34c602c85bd4e37373949c6709519c5a017b3e3d (patch)
tree048eac88061ec630652342130f3369fb10491a82 /overlay
parent756a35e334257f6fe4d17c65d1e02093464b4291 (diff)
BUILD(qmake): Remove
This commit removes all qmake-related build-files from the system. We have now migrated to cmake and are no longer maintaining qmake anyways and therefore there is no reason to keep it. Removing it also clearly states to any potential user/programmer that this project is no longer intended to be compiled with qmake. Given that the .pri files no longer exist, the mumble-version.py script had to be adapted to read the version from the CMakeLists.txt file instead. Furthermore a few of the submodules support cmake natively and therefore we no longer need the src/buid-directory approach in order to build them. The respective build dirs have been removed and the src-dirs have been renamed.
Diffstat (limited to 'overlay')
-rw-r--r--overlay/CMakeLists.txt2
-rw-r--r--overlay/overlay-shared.pro71
-rw-r--r--overlay/overlay.pro9
-rw-r--r--overlay/overlay_exe/overlay_exe-shared.pro40
-rw-r--r--overlay/overlay_exe/overlay_exe.pro9
5 files changed, 1 insertions, 130 deletions
diff --git a/overlay/CMakeLists.txt b/overlay/CMakeLists.txt
index 0ab2168be..6cb1e85cf 100644
--- a/overlay/CMakeLists.txt
+++ b/overlay/CMakeLists.txt
@@ -132,7 +132,7 @@ else()
endif()
if(64_BIT AND NOT BUILD_OVERLAY_XCOMPILE)
- add_subdirectory("${3RDPARTY_DIR}/minhook-src" "${CMAKE_CURRENT_BINARY_DIR}/minhook" EXCLUDE_FROM_ALL)
+ add_subdirectory("${3RDPARTY_DIR}/minhook" "${CMAKE_CURRENT_BINARY_DIR}/minhook" EXCLUDE_FROM_ALL)
target_compile_definitions(overlay PRIVATE "USE_MINHOOK")
target_link_libraries(overlay PRIVATE minhook)
endif()
diff --git a/overlay/overlay-shared.pro b/overlay/overlay-shared.pro
deleted file mode 100644
index 805bca527..000000000
--- a/overlay/overlay-shared.pro
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2005-2020 The Mumble Developers. All rights reserved.
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file at the root of the
-# Mumble source tree or at <https://www.mumble.info/LICENSE>.
-
-include (../qmake/compiler.pri)
-
-VERSION = 1.4.0
-TARGET_EXT = .dll
-TEMPLATE = lib
-CONFIG -= qt
-CONFIG *= dll shared debug_and_release warn_on
-CONFIG -= embed_manifest_dll
-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
-EFFECTS = overlay.fx
-DX11_PIXEL_SHADERS = overlay11.ps
-DX11_VERTEX_SHADERS = overlay11.vs
-
-DEFINES -= UNICODE
-
-QMAKE_CXXFLAGS_RELEASE -= -MD
-QMAKE_CXXFLAGS_DEBUG -= -MDd
-
-QMAKE_CXXFLAGS_RELEASE *= -MT
-QMAKE_CXXFLAGS_DEBUG *= -MTd
-
-LIBS *= -ldxguid -luuid -lole32 -luser32 -ladvapi32
-LIBS *= -ld3d9 -ld3d10 -ld3d11 -ld3dcompiler -ldxgi
-
-CONFIG(force-x86_64-toolchain) {
- DEFINES += USE_MINHOOK
- INCLUDEPATH *= ../3rdparty/minhook-src/include
- LIBS *= -lminhook
-}
-
-CONFIG(debug, debug|release) {
- DEFINES *= DEBUG
-}
-
-QMAKE_LIBDIR = $$DESTDIR $$QMAKE_LIBDIR
-
-# Override fxc binary for the x86 build.
-CONFIG(force-x86-toolchain) {
- exists($$DXSDK_DIR) {
- FXC = "\"$$(DXSDK_DIR)\\Utilities\\bin\\x86\\fxc.exe\""
- } else {
- FXC = fxc.exe
- }
-} else {
- FXC = fxc.exe
-}
-
-fxc.output = ${QMAKE_FILE_BASE}.hex
-fxc.commands = $${FXC} /Tfx_4_0 /O3 /Fh${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-fxc.input = EFFECTS
-fxc.CONFIG *= no_link target_predeps
-QMAKE_EXTRA_COMPILERS *= fxc
-
-vs11.output = ${QMAKE_FILE_BASE}.ps.h
-vs11.commands = $${FXC} /Tvs_5_0 /O3 /Vng_vertex_shader /Fh${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-vs11.input = DX11_VERTEX_SHADERS
-vs11.CONFIG *= no_link target_predeps
-QMAKE_EXTRA_COMPILERS *= vs11
-
-ps11.output = ${QMAKE_FILE_BASE}.vs.h
-ps11.commands = $${FXC} /Tps_5_0 /O3 /Vng_pixel_shader /Fh${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-ps11.input = DX11_PIXEL_SHADERS
-ps11.CONFIG *= no_link target_predeps
-QMAKE_EXTRA_COMPILERS *= ps11
diff --git a/overlay/overlay.pro b/overlay/overlay.pro
deleted file mode 100644
index 47accf263..000000000
--- a/overlay/overlay.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2005-2020 The Mumble Developers. All rights reserved.
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file at the root of the
-# Mumble source tree or at <https://www.mumble.info/LICENSE>.
-
-CONFIG += force-x86-toolchain
-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
deleted file mode 100644
index b2bbcb565..000000000
--- a/overlay/overlay_exe/overlay_exe-shared.pro
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2005-2020 The Mumble Developers. All rights reserved.
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file at the root of the
-# Mumble source tree or at <https://www.mumble.info/LICENSE>.
-
-include(../../qmake/compiler.pri)
-
-TEMPLATE = app
-CONFIG -= qt
-CONFIG += debug_and_release
-
-win32 {
- DEFINES += WIN32 _WIN32
- RC_FILE = overlay_exe.rc
- LIBS *= -luser32 -lshlwapi -lshell32
-
- CONFIG(release, debug|release) {
- QMAKE_CXXFLAGS_RELEASE -= -MD
- QMAKE_CXXFLAGS += -MT
- }
- CONFIG(debug, debug|release) {
- QMAKE_CXXFLAGS_DEBUG -= -MDd
- QMAKE_CXXFLAGS += -MTd
- }
-}
-
-SOURCES *= overlay_exe.cpp
-
-QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote(mt.exe -nologo -updateresource:$(DESTDIR_TARGET);1 -manifest ../../src/mumble/mumble.appcompat.manifest)
-
-CONFIG(debug, debug|release) {
- CONFIG += console
- DEFINES *= DEBUG
-}
-
-CONFIG(release, debug|release) {
- DEFINES *= NDEBUG
-}
-
-include(../../qmake/symbols.pri)
diff --git a/overlay/overlay_exe/overlay_exe.pro b/overlay/overlay_exe/overlay_exe.pro
deleted file mode 100644
index 045aa4a5a..000000000
--- a/overlay/overlay_exe/overlay_exe.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2005-2020 The Mumble Developers. All rights reserved.
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file at the root of the
-# Mumble source tree or at <https://www.mumble.info/LICENSE>.
-
-CONFIG += force-x86-toolchain
-TARGET = mumble_ol_helper
-
-include(overlay_exe-shared.pro)