diff options
164 files changed, 40 insertions, 4852 deletions
diff --git a/.gitmodules b/.gitmodules index d5b4d9042..6c036b031 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,17 +4,17 @@ [submodule "celt-0.7.0-src"] path = 3rdparty/celt-0.7.0-src url = https://github.com/mumble-voip/celt-0.7.0.git -[submodule "opus-src"] - path = 3rdparty/opus-src +[submodule "opus"] + path = 3rdparty/opus url = https://github.com/mumble-voip/opus.git -[submodule "3rdparty/minhook-src"] - path = 3rdparty/minhook-src +[submodule "3rdparty/minhook"] + path = 3rdparty/minhook url = https://github.com/mumble-voip/minhook.git [submodule "3rdparty/mach-override-src"] path = 3rdparty/mach-override-src url = https://github.com/mumble-voip/mach_override.git -[submodule "3rdparty/speexdsp-src"] - path = 3rdparty/speexdsp-src +[submodule "3rdparty/speexdsp"] + path = 3rdparty/speexdsp url = https://github.com/mumble-voip/speexdsp.git [submodule "3rdparty/rnnoise-src"] path = 3rdparty/rnnoise-src diff --git a/3rdparty/arc4random-src/LICENSE b/3rdparty/arc4random/LICENSE index 377f424fe..377f424fe 100644 --- a/3rdparty/arc4random-src/LICENSE +++ b/3rdparty/arc4random/LICENSE diff --git a/3rdparty/arc4random-src/arc4random_uniform.cpp b/3rdparty/arc4random/arc4random_uniform.cpp index 4ac1b6724..4ac1b6724 100644 --- a/3rdparty/arc4random-src/arc4random_uniform.cpp +++ b/3rdparty/arc4random/arc4random_uniform.cpp diff --git a/3rdparty/arc4random-src/arc4random_uniform.h b/3rdparty/arc4random/arc4random_uniform.h index 730f948c8..730f948c8 100644 --- a/3rdparty/arc4random-src/arc4random_uniform.h +++ b/3rdparty/arc4random/arc4random_uniform.h diff --git a/3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro b/3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro deleted file mode 100644 index e36dd8971..000000000 --- a/3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro +++ /dev/null @@ -1,81 +0,0 @@ -include(../../qmake/compiler.pri) - -BUILDDIR=$$basename(PWD) -SOURCEDIR=$$replace(BUILDDIR,-build,-src) -VERSION=$$replace(BUILDDIR,-build,) -VERSION=$$replace(VERSION,celt-,) - -!exists(../$$SOURCEDIR/COPYING) { - message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init) or build with CONFIG+=no-bundled-celt.") - error("Aborting configuration") -} - -TEMPLATE = lib -CONFIG -= qt -CONFIG += debug_and_release -CONFIG -= warn_on -CONFIG += warn_off -CONFIG += no_include_pwd -VPATH = ../$$SOURCEDIR/libcelt -TARGET = celt0 -RC_FILE = celt-0.7.0.rc -DEFINES += HAVE_CONFIG_H -TARGET_VERSION_EXT = .$$VERSION - -CONFIG(sbcelt) { - TARGET = celt - CONFIG += static -} else { - CONFIG(static) { - CONFIG -= static - CONFIG += shared - } -} - -!CONFIG(third-party-warnings) { - # We ignore warnings in third party builds. We won't actually look - # at them and they clutter out our warnings. - CONFIG -= warn_on - CONFIG += warn_off -} - -QMAKE_CFLAGS -= -fPIE -pie - -win32 { - DEFINES += WIN32 _WIN32 - - win32-g++ { - # MinGW uses the config.h for Unix-like systems. - INCLUDEPATH += ../$$BUILDDIR - } - - win32-msvc* { - INCLUDEPATH += ../$$BUILDDIR/win32 - - CONFIG(sse2) { - TARGET_VERSION_EXT = .$${VERSION}.sse2 - } else { - QMAKE_CFLAGS_RELEASE -= -arch:SSE - QMAKE_CFLAGS_DEBUG -= -arch:SSE - } - } -} - -unix { - contains(QMAKE_CFLAGS, -ffast-math) { - DEFINES += FLOAT_APPROX - } - - INCLUDEPATH += ../$$BUILDDIR -} - -SOURCES *= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c kiss_fftr.c laplace.c mdct.c modes.c pitch.c psy.c quant_bands.c rangedec.c rangeenc.c rate.c vq.c - -# TARGET is the same in both versions of CELT, thus we have to specify -# a separated folder to prevent objects collision between the two. -OBJECTS_DIR = $$OBJECTS_ROOT/celt-0.7.0-build -MOC_DIR = $$MOC_ROOT/celt-0.7.0-build -RCC_DIR = $$RCC_ROOT/celt-0.7.0-build -UI_DIR = $$UI_ROOT/celt-0.7.0-build - -include(../../qmake/symbols.pri) diff --git a/3rdparty/jack-src/jack/systemdeps.h b/3rdparty/jack/jack/systemdeps.h index 1a1119272..1a1119272 100644 --- a/3rdparty/jack-src/jack/systemdeps.h +++ b/3rdparty/jack/jack/systemdeps.h diff --git a/3rdparty/jack-src/jack/types.h b/3rdparty/jack/jack/types.h index b62af9648..b62af9648 100644 --- a/3rdparty/jack-src/jack/types.h +++ b/3rdparty/jack/jack/types.h diff --git a/3rdparty/mach-override-build/mach-override-build.pro b/3rdparty/mach-override-build/mach-override-build.pro deleted file mode 100644 index 95edf66f9..000000000 --- a/3rdparty/mach-override-build/mach-override-build.pro +++ /dev/null @@ -1,36 +0,0 @@ -include(../../qmake/compiler.pri) - -BUILDDIR=$$basename(PWD) -SOURCEDIR=$$replace(BUILDDIR,-build,-src) - -!exists(../$$SOURCEDIR/README.markdown) { - message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init).") - error("Aborting configuration") -} - -TEMPLATE = lib -CONFIG -= qt -CONFIG += debug_and_release -CONFIG += staticlib -CONFIG += x86_64 x86 - -!CONFIG(third-party-warnings) { - # We ignore warnings in third party builds. We won't actually look - # at them and they clutter out our warnings. - CONFIG -= warn_on - CONFIG += warn_off -} - -VPATH = ../mach-override-src -TARGET = mach-override -INCLUDEPATH = ../mach-override-src/ ../mach-override-src/libudis86 - -SOURCES *= \ - mach_override.c \ - libudis86/decode.c \ - libudis86/input.c \ - libudis86/itab.c \ - libudis86/syn-att.c \ - libudis86/syn-intel.c \ - libudis86/syn.c \ - libudis86/udis86.c diff --git a/3rdparty/minhook-src b/3rdparty/minhook -Subproject 5e338f86bc29ff9de49a274ae6cbc0c21cdc115 +Subproject 5e338f86bc29ff9de49a274ae6cbc0c21cdc115 diff --git a/3rdparty/minhook-build/minhook-build.pro b/3rdparty/minhook-build/minhook-build.pro deleted file mode 100644 index 1aada668c..000000000 --- a/3rdparty/minhook-build/minhook-build.pro +++ /dev/null @@ -1,41 +0,0 @@ -CONFIG += force-x86_64-toolchain
-include(../../qmake/compiler.pri)
-
-BUILDDIR=$$basename(PWD)
-SOURCEDIR=$$replace(BUILDDIR,-build,-src)
-
-!exists(../$$SOURCEDIR/README.md) {
- message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init).")
- error("Aborting configuration")
-}
-
-TEMPLATE = lib
-CONFIG -= qt
-CONFIG += debug_and_release
-CONFIG += staticlib
-VPATH = ../$$SOURCEDIR
-TARGET = minhook
-INCLUDEPATH *= ../$$SOURCEDIR/src ../$$SOURCEDIR/src/hde ../$$SOURCEDIR/include
-DEFINES += WIN32 _WINDOWS _USRDLL MINHOOK_EXPORTS
-
-!CONFIG(third-party-warnings) {
- # We ignore warnings in third party builds. We won't actually look
- # at them and they clutter out our warnings.
- CONFIG -= warn_on
- CONFIG += warn_off
-}
-
-win32-msvc* {
- QMAKE_CFLAGS_RELEASE -= -MD
- QMAKE_CFLAGS_DEBUG -= -MDd
-
- QMAKE_CXXFLAGS_RELEASE *= -MT
- QMAKE_CXXFLAGS_DEBUG *= -MTd
-}
-
-SOURCES *= \
- src/hde/hde64.c \
- src/hde/hde32.c \
- src/buffer.c \
- src/hook.c \
- src/trampoline.c
diff --git a/3rdparty/opus-src b/3rdparty/opus -Subproject 296d213da679eea977a869583b59f1e5a51b9ff +Subproject 296d213da679eea977a869583b59f1e5a51b9ff diff --git a/3rdparty/opus-build/config.h b/3rdparty/opus-build/config.h deleted file mode 100644 index 889d7995e..000000000 --- a/3rdparty/opus-build/config.h +++ /dev/null @@ -1,163 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Use ARM NEON optimizations */ -/* #undef ARM_HAVE_NEON */ - -/* Use generic ARMv4 asm optimizations */ -/* #undef ARMv4_ASM */ - -/* Use ARMv5E asm optimizations */ -/* #undef ARMv5E_ASM */ - -/* Use ARMv6 asm optimizations */ -/* #undef ARMv6_ASM */ - -/* Custom modes */ -/* #undef CUSTOM_MODES */ - -/* Assertions */ -/* #undef ENABLE_ASSERTIONS */ - -/* Debug fixed-point implementation */ -/* #undef FIXED_DEBUG */ - -/* Compile as fixed-point (for machines without a fast enough FPU) */ -/* #undef FIXED_POINT */ - -/* Float approximations */ -/* #undef FLOAT_APPROX */ - -/* Fuzzing */ -/* #undef FUZZING */ - -/* Define to 1 if you have the <alloca.h> header file. */ -/* #undef HAVE_ALLOCA_H */ - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `lrint' function. */ -#define HAVE_LRINT 1 - -/* Define to 1 if you have the `lrintf' function. */ -#define HAVE_LRINTF 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `__malloc_hook' function. */ -#define HAVE___MALLOC_HOOK 1 - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - -/* This is a build of OPUS */ -#define OPUS_BUILD /**/ - -/* Use run-time CPU capabilities detection */ -/* #undef OPUS_HAVE_RTCD */ - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "opus@xiph.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "opus" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "opus 1.2.1" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "opus" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.1" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Make use of alloca */ -/* #undef USE_ALLOCA */ - -/* Use C99 variable-size arrays */ -#define VAR_ARRAYS 1 - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to the equivalent of the C99 'restrict' keyword, or to - nothing if this is not supported. Do not define if restrict is - supported directly. */ -#define restrict __restrict -/* Work around a bug in Sun C++: it does not support _Restrict or - __restrict__, even though the corresponding Sun C compiler ends up with - "#define restrict _Restrict" or "#define restrict __restrict__" in the - previous line. Perhaps some future version of Sun C++ will work with - restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ -#if defined __SUNPRO_CC && !defined __RESTRICT -# define _Restrict -# define __restrict__ -#endif - -// For now, only enable for OS X. We're sure -// that modern OS X is x86-64, but we can't make -// the same assumption for other Unix-like OSes. -#if defined(__APPLE__) && defined(__x86_64__) -/* Use run-time CPU capabilities detection */ -/* #undef OPUS_HAVE_RTCD */ - -/* Compiler supports X86 SSE Intrinsics */ -#define OPUS_X86_MAY_HAVE_SSE 1 - -/* Compiler supports X86 SSE2 Intrinsics */ -#define OPUS_X86_MAY_HAVE_SSE2 1 - -/* Compiler supports X86 SSE4.1 Intrinsics */ -/* #undef OPUS_X86_MAY_HAVE_SSE4_1 */ - -/* Define if binary requires SSE intrinsics support */ -#define OPUS_X86_PRESUME_SSE 1 - -/* Define if binary requires SSE2 intrinsics support */ -#define OPUS_X86_PRESUME_SSE2 1 - -/* Define if binary requires SSE4.1 intrinsics support */ -/* #undef OPUS_X86_PRESUME_SSE4_1 */ -#endif diff --git a/3rdparty/opus-build/opus-build.pro b/3rdparty/opus-build/opus-build.pro deleted file mode 100644 index cc8a6460b..000000000 --- a/3rdparty/opus-build/opus-build.pro +++ /dev/null @@ -1,254 +0,0 @@ -include(../../qmake/compiler.pri) - -BUILDDIR=$$basename(PWD) -SOURCEDIR=$$replace(BUILDDIR,-build,-src) - -!win32 { - VERSION=0 #$$ Fool packaging script -} - -!exists(../$$SOURCEDIR/COPYING) { - message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init).") - error("Aborting configuration") -} - -TEMPLATE = lib -CONFIG -= qt -CONFIG += debug_and_release -CONFIG += no_include_pwd -VPATH = ../$$SOURCEDIR -TARGET = opus -DEFINES += HAVE_CONFIG_H - -CONFIG(static) { - CONFIG -= static - CONFIG += shared -} - -!CONFIG(third-party-warnings) { - # We ignore warnings in third party builds. We won't actually look - # at them and they clutter out our warnings. - CONFIG -= warn_on - CONFIG += warn_off -} - -QMAKE_CFLAGS -= -fPIE -pie - -win32 { - DEFINES += WIN32 _WIN32 - INCLUDEPATH += ../$$BUILDDIR/win32 - - CONFIG(sse2) { - TARGET_VERSION_EXT = .sse2 - } else { - QMAKE_CFLAGS_RELEASE -= -arch:SSE - QMAKE_CFLAGS_DEBUG -= -arch:SSE - } -} - -unix { - contains(QMAKE_CFLAGS, -ffast-math) { - DEFINES += FLOAT_APPROX - } - - INCLUDEPATH += ../$$BUILDDIR -} - -INCLUDEPATH *= \ -../$$SOURCEDIR \ -../$$SOURCEDIR/celt \ -../$$SOURCEDIR/celt/x86 \ -../$$SOURCEDIR/include \ -../$$SOURCEDIR/silk \ -../$$SOURCEDIR/silk/x86 \ -../$$SOURCEDIR/silk/float - -win32-msvc* { - CONFIG *= opus-sse-sources - CONFIG *= opus-sse2-sources - CONFIG *= opus-sse41-sources -} - -macx:!CONFIG(universal) { - CONFIG *= opus-sse-sources - CONFIG *= opus-sse2-sources -} - -# celt_sources.mk: CELT_SOURCES -SOURCES *= \ -celt/bands.c \ -celt/celt.c \ -celt/celt_encoder.c \ -celt/celt_decoder.c \ -celt/cwrs.c \ -celt/entcode.c \ -celt/entdec.c \ -celt/entenc.c \ -celt/kiss_fft.c \ -celt/laplace.c \ -celt/mathops.c \ -celt/mdct.c \ -celt/modes.c \ -celt/pitch.c \ -celt/celt_lpc.c \ -celt/quant_bands.c \ -celt/rate.c \ -celt/vq.c - -CONFIG(opus-sse-sources) { - # celt_sources.mk: CELT_SOURCES_SSE - SOURCES *= \ - celt/x86/x86cpu.c \ - celt/x86/x86_celt_map.c \ - celt/x86/pitch_sse.c -} - -CONFIG(opus-sse2-sources) { - # celt_sources.mk: CELT_SOURCES_SSE2 - SOURCES *= \ - celt/x86/pitch_sse2.c \ - celt/x86/vq_sse2.c -} - -CONFIG(opus-sse41-sources) { - # celt_sources.mk: CELT_SOURCES_SSE4_1 - SOURCES *= \ - celt/x86/celt_lpc_sse4_1.c \ - celt/x86/pitch_sse4_1.c -} - -# silk_sources.mk: SILK_SOURCES + SILK_SOURCES_FLOAT -SOURCES *= \ -silk/CNG.c \ -silk/code_signs.c \ -silk/init_decoder.c \ -silk/decode_core.c \ -silk/decode_frame.c \ -silk/decode_parameters.c \ -silk/decode_indices.c \ -silk/decode_pulses.c \ -silk/decoder_set_fs.c \ -silk/dec_API.c \ -silk/enc_API.c \ -silk/encode_indices.c \ -silk/encode_pulses.c \ -silk/gain_quant.c \ -silk/interpolate.c \ -silk/LP_variable_cutoff.c \ -silk/NLSF_decode.c \ -silk/NSQ.c \ -silk/NSQ_del_dec.c \ -silk/PLC.c \ -silk/shell_coder.c \ -silk/tables_gain.c \ -silk/tables_LTP.c \ -silk/tables_NLSF_CB_NB_MB.c \ -silk/tables_NLSF_CB_WB.c \ -silk/tables_other.c \ -silk/tables_pitch_lag.c \ -silk/tables_pulses_per_block.c \ -silk/VAD.c \ -silk/control_audio_bandwidth.c \ -silk/quant_LTP_gains.c \ -silk/VQ_WMat_EC.c \ -silk/HP_variable_cutoff.c \ -silk/NLSF_encode.c \ -silk/NLSF_VQ.c \ -silk/NLSF_unpack.c \ -silk/NLSF_del_dec_quant.c \ -silk/process_NLSFs.c \ -silk/stereo_LR_to_MS.c \ -silk/stereo_MS_to_LR.c \ -silk/check_control_input.c \ -silk/control_SNR.c \ -silk/init_encoder.c \ -silk/control_codec.c \ -silk/A2NLSF.c \ -silk/ana_filt_bank_1.c \ -silk/biquad_alt.c \ -silk/bwexpander_32.c \ -silk/bwexpander.c \ -silk/debug.c \ -silk/decode_pitch.c \ -silk/inner_prod_aligned.c \ -silk/lin2log.c \ -silk/log2lin.c \ -silk/LPC_analysis_filter.c \ -silk/LPC_inv_pred_gain.c \ -silk/table_LSF_cos.c \ -silk/NLSF2A.c \ -silk/NLSF_stabilize.c \ -silk/NLSF_VQ_weights_laroia.c \ -silk/pitch_est_tables.c \ -silk/resampler.c \ -silk/resampler_down2_3.c \ -silk/resampler_down2.c \ -silk/resampler_private_AR2.c \ -silk/resampler_private_down_FIR.c \ -silk/resampler_private_IIR_FIR.c \ -silk/resampler_private_up2_HQ.c \ -silk/resampler_rom.c \ -silk/sigm_Q15.c \ -silk/sort.c \ -silk/sum_sqr_shift.c \ -silk/stereo_decode_pred.c \ -silk/stereo_encode_pred.c \ -silk/stereo_find_predictor.c \ -silk/stereo_quant_pred.c \ -silk/LPC_fit.c \ -silk/float/apply_sine_window_FLP.c \ -silk/float/corrMatrix_FLP.c \ -silk/float/encode_frame_FLP.c \ -silk/float/find_LPC_FLP.c \ -silk/float/find_LTP_FLP.c \ -silk/float/find_pitch_lags_FLP.c \ -silk/float/find_pred_coefs_FLP.c \ -silk/float/LPC_analysis_filter_FLP.c \ -silk/float/LTP_analysis_filter_FLP.c \ -silk/float/LTP_scale_ctrl_FLP.c \ -silk/float/noise_shape_analysis_FLP.c \ -silk/float/process_gains_FLP.c \ -silk/float/regularize_correlations_FLP.c \ -silk/float/residual_energy_FLP.c \ -silk/float/warped_autocorrelation_FLP.c \ -silk/float/wrappers_FLP.c \ -silk/float/autocorrelation_FLP.c \ -silk/float/burg_modified_FLP.c \ -silk/float/bwexpander_FLP.c \ -silk/float/energy_FLP.c \ -silk/float/inner_product_FLP.c \ -silk/float/k2a_FLP.c \ -silk/float/LPC_inv_pred_gain_FLP.c \ -silk/float/pitch_analysis_core_FLP.c \ -silk/float/scale_copy_vector_FLP.c \ -silk/float/scale_vector_FLP.c \ -silk/float/schur_FLP.c \ -silk/float/sort_FLP.c - -CONFIG(opus-sse41-sources) { - # silk_sources.mk: SILK_SOURCES_SSE4_1 - SOURCES *= \ - silk/x86/NSQ_sse4_1.c \ - silk/x86/NSQ_del_dec_sse4_1.c \ - silk/x86/x86_silk_map.c \ - silk/x86/VAD_sse4_1.c \ - silk/x86/VQ_WMat_EC_sse4_1.c -} - -# opus_sources.mk: OPUS_SOURCES + OPUS_SOURCES_FLOAT -SOURCES *= \ -src/opus.c \ -src/opus_decoder.c \ -src/opus_encoder.c \ -src/opus_multistream.c \ -src/opus_multistream_encoder.c \ -src/opus_multistream_decoder.c \ -src/repacketizer.c \ -src/opus_projection_encoder.c \ -src/opus_projection_decoder.c \ -src/mapping_matrix.c \ -src/analysis.c \ -src/mlp.c \ -src/mlp_data.c - -include(../../qmake/symbols.pri) diff --git a/3rdparty/opus-build/win32/config.h b/3rdparty/opus-build/win32/config.h deleted file mode 100644 index 4df1edc31..000000000 --- a/3rdparty/opus-build/win32/config.h +++ /dev/null @@ -1,65 +0,0 @@ -/*********************************************************************** -Copyright (c) 2011, Skype Limited. All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -- Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. -- Neither the name of Internet Society, IETF or IETF Trust, nor the -names of specific contributors, may be used to endorse or promote -products derived from this software without specific prior written -permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. -***********************************************************************/ - -#ifndef CONFIG_H -#define CONFIG_H - -#define USE_ALLOCA 1 - -/* Comment out the next line for floating-point code */ -/*#define FIXED_POINT 1 */ - -#define OPUS_BUILD 1 -#define DLL_EXPORT 1 - -#if defined(_M_IX86) || defined(_M_X64) -/* Can always compile SSE intrinsics (no special compiler flags necessary) */ -#define OPUS_X86_MAY_HAVE_SSE -#define OPUS_X86_MAY_HAVE_SSE2 -#define OPUS_X86_MAY_HAVE_SSE4_1 - -/* Presume SSE functions, if compiled to use SSE/SSE2/AVX (note that AMD64 implies SSE2, and AVX - implies SSE4.1) */ -#if defined(_M_X64) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 1)) || defined(__AVX__) -#define OPUS_X86_PRESUME_SSE 1 -#endif -#if defined(_M_X64) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 2)) || defined(__AVX__) -#define OPUS_X86_PRESUME_SSE2 1 -#endif -#if defined(__AVX__) -#define OPUS_X86_PRESUME_SSE4_1 1 -#endif - -#if !defined(OPUS_X86_PRESUME_SSE4_1) || !defined(OPUS_X86_PRESUME_SSE2) || !defined(OPUS_X86_PRESUME_SSE) -#define OPUS_HAVE_RTCD 1 -#endif - -#endif - -#include "version.h" - -#endif /* CONFIG_H */ diff --git a/3rdparty/opus-build/win32/version.h b/3rdparty/opus-build/win32/version.h deleted file mode 100644 index fd41edacd..000000000 --- a/3rdparty/opus-build/win32/version.h +++ /dev/null @@ -1 +0,0 @@ -#define PACKAGE_VERSION "v1.1.3" diff --git a/3rdparty/portaudio-src/portaudio.h b/3rdparty/portaudio/portaudio.h index 738080d43..738080d43 100644 --- a/3rdparty/portaudio-src/portaudio.h +++ b/3rdparty/portaudio/portaudio.h diff --git a/3rdparty/qqbonjour-src/BonjourRecord.h b/3rdparty/qqbonjour/BonjourRecord.h index 3bf553eb1..3bf553eb1 100644 --- a/3rdparty/qqbonjour-src/BonjourRecord.h +++ b/3rdparty/qqbonjour/BonjourRecord.h diff --git a/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp b/3rdparty/qqbonjour/BonjourServiceBrowser.cpp index 329c42c4b..329c42c4b 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp +++ b/3rdparty/qqbonjour/BonjourServiceBrowser.cpp diff --git a/3rdparty/qqbonjour-src/BonjourServiceBrowser.h b/3rdparty/qqbonjour/BonjourServiceBrowser.h index 0bc0c743a..0bc0c743a 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceBrowser.h +++ b/3rdparty/qqbonjour/BonjourServiceBrowser.h diff --git a/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp b/3rdparty/qqbonjour/BonjourServiceRegister.cpp index b9143e3ed..b9143e3ed 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp +++ b/3rdparty/qqbonjour/BonjourServiceRegister.cpp diff --git a/3rdparty/qqbonjour-src/BonjourServiceRegister.h b/3rdparty/qqbonjour/BonjourServiceRegister.h index 6b37749c3..6b37749c3 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceRegister.h +++ b/3rdparty/qqbonjour/BonjourServiceRegister.h diff --git a/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp b/3rdparty/qqbonjour/BonjourServiceResolver.cpp index 18b9e571d..18b9e571d 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp +++ b/3rdparty/qqbonjour/BonjourServiceResolver.cpp diff --git a/3rdparty/qqbonjour-src/BonjourServiceResolver.h b/3rdparty/qqbonjour/BonjourServiceResolver.h index d2a669ea1..d2a669ea1 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceResolver.h +++ b/3rdparty/qqbonjour/BonjourServiceResolver.h diff --git a/3rdparty/qqbonjour-src/LICENSE b/3rdparty/qqbonjour/LICENSE index 0d974d830..0d974d830 100644 --- a/3rdparty/qqbonjour-src/LICENSE +++ b/3rdparty/qqbonjour/LICENSE diff --git a/3rdparty/qqbonjour-src/README b/3rdparty/qqbonjour/README index c13703607..c13703607 100644 --- a/3rdparty/qqbonjour-src/README +++ b/3rdparty/qqbonjour/README diff --git a/3rdparty/rnnoise-build/rnnoise-build.pro b/3rdparty/rnnoise-build/rnnoise-build.pro deleted file mode 100644 index c427445e9..000000000 --- a/3rdparty/rnnoise-build/rnnoise-build.pro +++ /dev/null @@ -1,63 +0,0 @@ -include(../../qmake/compiler.pri) - -BUILDDIR=$$basename(PWD) -SOURCEDIR=$$replace(BUILDDIR,-build,-src) - -!win32 { - VERSION=0 #$$ Fool packaging script -} - -!exists(../$$SOURCEDIR/COPYING) { - message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init).") - error("Aborting configuration") -} - -TEMPLATE = lib -CONFIG -= qt -CONFIG += debug_and_release -VPATH = ../$$SOURCEDIR -TARGET = rnnoise -DEFINES += HAVE_CONFIG_H - -!CONFIG(third-party-warnings) { - # We ignore warnings in third party builds. We won't actually look - # at them and they clutter out our warnings. - CONFIG -= warn_on - CONFIG += warn_off -} - -QMAKE_CFLAGS -= -fPIE -pie - -win32 { - DEFINES += WIN32 _WIN32 - DEFINES += DLL_EXPORT - - CONFIG -= static - CONFIG += shared -} - -win32-msvc* { - DEFINES += _USE_MATH_DEFINES # To define M_PI - DEFINES += USE_MALLOC # To use malloc() and free() instead of variable length arrays -} - -unix { - CONFIG += staticlib - - contains(QMAKE_CFLAGS, -ffast-math) { - DEFINES += FLOAT_APPROX - } -} - -INCLUDEPATH *= \ -../$$SOURCEDIR/include \ - -SOURCES *= \ -src/rnn_data.c \ -src/rnn.c \ -src/pitch.c \ -src/kiss_fft.c \ -src/denoise.c \ -src/celt_lpc.c - -include(../../qmake/symbols.pri) diff --git a/3rdparty/smallft-src/LICENSE b/3rdparty/smallft/LICENSE index 401e5f838..401e5f838 100644 --- a/3rdparty/smallft-src/LICENSE +++ b/3rdparty/smallft/LICENSE diff --git a/3rdparty/smallft-src/smallft.cpp b/3rdparty/smallft/smallft.cpp index 210590f90..210590f90 100644 --- a/3rdparty/smallft-src/smallft.cpp +++ b/3rdparty/smallft/smallft.cpp diff --git a/3rdparty/smallft-src/smallft.h b/3rdparty/smallft/smallft.h index e1569c89d..e1569c89d 100644 --- a/3rdparty/smallft-src/smallft.h +++ b/3rdparty/smallft/smallft.h diff --git a/3rdparty/speex-build/AGC.pro b/3rdparty/speex-build/AGC.pro deleted file mode 100644 index cd2e0f0b4..000000000 --- a/3rdparty/speex-build/AGC.pro +++ /dev/null @@ -1,11 +0,0 @@ -include(../../qmake/compiler.pri) - -TEMPLATE =app -CONFIG += qt warn_on release console -QT -= gui -TARGET = AGC -SOURCES = AGC.cpp -HEADERS = Timer.h -INCLUDEPATH = ../src ../speex-src/include -LIBS += -lspeex -QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR diff --git a/3rdparty/speex-build/CMakeLists.txt b/3rdparty/speex-build/CMakeLists.txt index fc3b2a53b..9bad21e0e 100644 --- a/3rdparty/speex-build/CMakeLists.txt +++ b/3rdparty/speex-build/CMakeLists.txt @@ -1,5 +1,5 @@ set(SPEEX_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../speex-src") -set(SPEEXDSP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../speexdsp-src") +set(SPEEXDSP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../speexdsp") set(SPEEX_SRC_DIR "${SPEEX_DIR}/libspeex") set(SPEEXDSP_SRC_DIR "${SPEEXDSP_DIR}/libspeexdsp") diff --git a/3rdparty/speex-build/ResampMark.pro b/3rdparty/speex-build/ResampMark.pro deleted file mode 100644 index d3385b2f4..000000000 --- a/3rdparty/speex-build/ResampMark.pro +++ /dev/null @@ -1,11 +0,0 @@ -include(../../qmake/compiler.pri) - -TEMPLATE =app -CONFIG += qt warn_on release console -QT -= gui -TARGET = ResampMark -SOURCES = ResampMark.cpp -HEADERS = Timer.h -INCLUDEPATH = ../../src ../speex-src/include -LIBS += -lspeex -QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR diff --git a/3rdparty/speex-build/SpeexMark.pro b/3rdparty/speex-build/SpeexMark.pro deleted file mode 100644 index 3c2f763a3..000000000 --- a/3rdparty/speex-build/SpeexMark.pro +++ /dev/null @@ -1,11 +0,0 @@ -include(../../qmake/compiler.pri) - -TEMPLATE =app -CONFIG += qt warn_on release console -QT -= gui -TARGET = SpeexMark -SOURCES = SpeexMark.cpp -HEADERS = Timer.h -INCLUDEPATH = ../src ../speex-src/include -LIBS += -lspeex -QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR diff --git a/3rdparty/speex-build/speex-build.pro b/3rdparty/speex-build/speex-build.pro deleted file mode 100644 index abaa63cfb..000000000 --- a/3rdparty/speex-build/speex-build.pro +++ /dev/null @@ -1,75 +0,0 @@ -include(../../qmake/compiler.pri) - -!exists(../speex-src/COPYING) | !exists(../speexdsp-src/COPYING) { - message("The speex-src/ or speexdsp-src/ directories were not found. You need to do one of the following:") - message("") - message("Option 1: Use Speex Git:") - message("git submodule init") - message("git submodule update") - message("") - message("Option 2: Use system speex and speex-dsp (v 1.2 or later):") - message("qmake CONFIG+=no-bundled-speex -recursive") - message("") - error("Aborting configuration") -} - -TEMPLATE = lib -CONFIG -= qt -CONFIG += debug_and_release -CONFIG -= warn_on -CONFIG += warn_off -CONFIG += no_include_pwd - -# Enable no_batch, which disables nmake's inference rules. -# We have to do this because we use files from two VPATHs -# below, and nmake is unable to figure out how to handle -# that. -CONFIG += no_batch -VPATH = ../speex-src/libspeex ../speexdsp-src/libspeexdsp - -TARGET = speex -DEFINES += NDEBUG HAVE_CONFIG_H -INCLUDEPATH = ../speex-src/include ../speex-src/libspeex ../speexdsp-src/include ../speexdsp-src/libspeexdsp - -win32 { - INCLUDEPATH += ../speex-build/win32 - DEFINES+=WIN32 _WINDOWS _USE_SSE _USE_MATH_DEFINES - - win32-g++ { - # MinGW uses the config.h for Unix-like systems. - INCLUDEPATH += ../speex-build - } - - win32-msvc* { - INCLUDEPATH += ../speex-build/win32 - - CONFIG(sse2) { - TARGET = speex.sse2 - DEFINES += _USE_SSE2 - } else { - QMAKE_CFLAGS_RELEASE -= -arch:SSE - QMAKE_CFLAGS_DEBUG -= -arch:SSE - } - } - - SOURCES *= mumble_speex_init.c - - CONFIG -= static - CONFIG += shared - - DEFINES+=USE_SMALLFT - -} else { - CONFIG += staticlib - INCLUDEPATH += ../speex-build -} - -DEF_FILE = speex.def - -# libspeexdsp -SOURCES *= mdf.c resample.c preprocess.c jitter.c filterbank.c fftwrap.c smallft.c -# libspeex -SOURCES *= bits.c cb_search.c exc_10_16_table.c exc_10_32_table.c exc_20_32_table.c exc_5_256_table.c exc_5_64_table.c exc_8_128_table.c filters.c gain_table.c gain_table_lbr.c hexc_10_32_table.c hexc_table.c high_lsp_tables.c lpc.c lsp.c lsp_tables_nb.c ltp.c modes.c modes_wb.c nb_celp.c quant_lsp.c sb_celp.c scal.c speex.c speex_callbacks.c speex_header.c stereo.c vbr.c vq.c kiss_fft.c kiss_fftr.c vorbis_psy.c window.c - - - diff --git a/3rdparty/speexdsp-src b/3rdparty/speexdsp -Subproject a2133f5904ddb616b6578920bd2199f5accb484 +Subproject a2133f5904ddb616b6578920bd2199f5accb484 diff --git a/3rdparty/xinputcheck-build/xinputcheck-build.pro b/3rdparty/xinputcheck-build/xinputcheck-build.pro deleted file mode 100644 index 9362b09c4..000000000 --- a/3rdparty/xinputcheck-build/xinputcheck-build.pro +++ /dev/null @@ -1,18 +0,0 @@ -include(../../qmake/compiler.pri) - -BUILDDIR=$$basename(PWD) -SOURCEDIR=$$replace(BUILDDIR,-lib-build,-src) - -TEMPLATE = lib -CONFIG -= qt -CONFIG += debug_and_release -CONFIG -= warn_on -CONFIG += warn_off -CONFIG += static -VPATH = ../xinputcheck-src -TARGET = xinputcheck -INCLUDEPATH = ../$$SOURCEDIR - -SOURCES *= xinputcheck.cpp - -include(../../qmake/symbols.pri) diff --git a/g15helper/g15helper.pro b/g15helper/g15helper.pro deleted file mode 100644 index 07402695b..000000000 --- a/g15helper/g15helper.pro +++ /dev/null @@ -1,101 +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>. - -# Build rules for G15 helper daemon - -win32:!CONFIG(g15-emulator) { - CONFIG += force-x86-toolchain -} -include (../qmake/compiler.pri) - -TEMPLATE = app -CONFIG *= debug_and_release warn_on -TARGET = mumble-g15-helper - -HEADERS = g15helper.h - -# The g15helper utility can be built in two modes: -# -# - Native. This is what will be built if you're -# on Windows or macOS by default. -# -# - Emulator. This can be enabled by using the -# CONFIG(g15-emulator) when invoking qmake. -# Instead of building a g15helper that talks -# to the G15 LCD using the Logitech provided -# library, we build a small program that -# emulates the LCD display in an on-screen -# window. This is useful for debugging -# Mumble's LCD/G15 support. -CONFIG(g15-emulator) { - QT *= core gui - isEqual(QT_MAJOR_VERSION, 5) { - QT *= widgets - } - - SOURCES *= g15helper_emu.cpp - HEADERS *= g15helper_emu.h - - win32 { - RC_FILE = g15helper.rc - - win32-msvc* { - QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote(mt.exe -nologo -updateresource:$(DESTDIR_TARGET);1 -manifest ../src/mumble/mumble.appcompat.manifest) - } - } -} else { - CONFIG -= qt - - win32 { - SOURCES = g15helper.c - RC_FILE = g15helper.rc - LIBS *= -llgLcd -ladvapi32 -lshell32 -luser32 - QMAKE_LIBDIR *= "$$G15SDK_PATH/Lib/x86" - INCLUDEPATH *= "$$G15SDK_PATH/Src" - DEFINES *= WIN32 - - win32-msvc* { - 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(release, debug|release) { - QMAKE_CFLAGS_RELEASE -= -MD - QMAKE_CFLAGS_RELEASE *= -MT - QMAKE_CXXFLAGS_RELEASE -= -MD - QMAKE_CXXFLAGS_RELEASE *= -MT - } - CONFIG(debug, debug|release) { - QMAKE_CFLAGS_DEBUG -= -MDd - QMAKE_CFLAGS_DEBUG *= -MTd - QMAKE_CXXFLAGS_DEBUG -= -MDd - QMAKE_CXXFLAGS_DEBUG *= -MTd - } - } - - macx { - CONFIG -= app_bundle - isEqual(QT_MAJOR_VERSION, 5) { - QMAKE_CFLAGS += -arch i386 - QMAKE_OBJECTIVE_CFLAGS += -arch i386 - QMAKE_CXXFLAGS += -arch i386 - QMAKE_LFLAGS += -arch i386 - } else { - CONFIG -= x86_64 - CONFIG += x86 - } - SOURCES = g15helper_macx.c - LIBS *= -llgLcd - QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/../LCDSDK/lib/ - INCLUDEPATH *= $$(MUMBLE_PREFIX)/../LCDSDK/Src/ - QMAKE_LFLAGS += -framework CoreFoundation -sectcreate __TEXT __info_plist g15helper.plist - DEFINES *= APPLE - } -} - -CONFIG(debug, debug|release) { - DEFINES *= USE_LOGFILE -} - -include(../qmake/symbols.pri) diff --git a/macx/common.pri b/macx/common.pri deleted file mode 100644 index 321d9edf7..000000000 --- a/macx/common.pri +++ /dev/null @@ -1,11 +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>. - -# Common OSX overlay settings. - -VERSION = 1.4.0 - -DEFINES *= VERSION=\\\"$$VERSION\\\" - diff --git a/macx/macx.pro b/macx/macx.pro deleted file mode 100644 index 565f22bca..000000000 --- a/macx/macx.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>. - -TEMPLATE = subdirs - -CONFIG += debug_and_release -SUBDIRS = osax diff --git a/macx/osax/osax.pro b/macx/osax/osax.pro deleted file mode 100644 index e2a60c162..000000000 --- a/macx/osax/osax.pro +++ /dev/null @@ -1,37 +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>. - -# Mumble Overlay scripting addition -# (for injection into running processes) - -include(../../qmake/compiler.pri) - -CONFIG += x86_64 debug_and_release -CONFIG(universal) { - CONFIG += ppc -} - -TEMPLATE = lib -CONFIG += plugin plugin_bundle -CONFIG -= gui qt - -CONFIG(static) { - CONFIG -= static -} - -TARGET = MumbleOverlay -QMAKE_INFO_PLIST = osax.plist - -QMAKE_LFLAGS = -framework Foundation -framework Cocoa -QMAKE_BUNDLE_EXTENSION = .osax -QMAKE_LFLAGS_PLUGIN = -bundle - -SDEF.files = MumbleOverlay.sdef -SDEF.path = Contents/Resources -QMAKE_BUNDLE_DATA += SDEF - -OBJECTIVE_SOURCES = osax.m - -include(../../qmake/symbols.pri) diff --git a/main.pro b/main.pro deleted file mode 100644 index a490c0036..000000000 --- a/main.pro +++ /dev/null @@ -1,114 +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 = subdirs -CONFIG *= ordered debug_and_release - -SUBDIRS *= src/mumble_proto - -!CONFIG(no-client) { - unix:!CONFIG(bundled-speex):system($$PKG_CONFIG --atleast-version=1.2 speexdsp):system($$PKG_CONFIG --atleast-version=1.2 speex) { - CONFIG *= no-bundled-speex - } - !CONFIG(no-bundled-speex) { - SUBDIRS *= 3rdparty/speex-build - } - - CONFIG(sbcelt) { - SUBDIRS *= 3rdparty/celt-0.7.0-build 3rdparty/sbcelt-lib-build 3rdparty/sbcelt-helper-build - } else { - unix:!CONFIG(bundled-celt):system($$PKG_CONFIG --atleast-version=0.7.0 celt) { - CONFIG *= no-bundled-celt - } - !CONFIG(no-bundled-celt) { - SUBDIRS *= 3rdparty/celt-0.7.0-build - } - } - - !CONFIG(no-opus) { - CONFIG *= opus - } - - CONFIG(opus):!CONFIG(no-bundled-opus) { - SUBDIRS *= 3rdparty/opus-build - } - - !CONFIG(no-rnnoise) { - CONFIG *= rnnoise - } - - CONFIG(rnnoise):!CONFIG(no-bundled-rnnoise) { - SUBDIRS *= 3rdparty/rnnoise-build - } - - win32 { - SUBDIRS *= 3rdparty/xinputcheck-build - } - - SUBDIRS *= src/mumble - - win32:CONFIG(static) { - SUBDIRS *= src/mumble_exe - } - - !CONFIG(no-plugins) { - SUBDIRS *= plugins - } - - win32:!CONFIG(no-overlay) { - SUBDIRS *= 3rdparty/minhook-build - SUBDIRS *= overlay - SUBDIRS *= overlay/overlay_exe - SUBDIRS *= overlay_winx64 - SUBDIRS *= overlay_winx64/overlay_exe_winx64 - } - - win32:!CONFIG(no-g15) { - SUBDIRS *= g15helper - } - - contains(UNAME, OpenBSD) { - CONFIG *= no-overlay - } - - unix:!macx:!CONFIG(no-overlay) { - SUBDIRS *= overlay_gl - } - - macx { - !CONFIG(buildenv) { - error("Not inside a Mumble buildenv ($MUMBLE_PREFIX environment variable is missing)"); - } - SUBDIRS *= 3rdparty/mach-override-build - SUBDIRS *= overlay_gl - SUBDIRS *= macx - !exists($$(MUMBLE_PREFIX)/../LCDSDK) { - CONFIG *= no-g15 - } - !CONFIG(no-g15) { - SUBDIRS *= g15helper - } - } -} - -!CONFIG(no-server) { - !CONFIG(no-ice) { - SUBDIRS *= src/murmur/murmur_ice - } - CONFIG(grpc) { - !system($$PKG_CONFIG --atleast-version=3 protobuf) { - error(grpc requires protobuf>=3) - } - SUBDIRS *= src/murmur_grpcwrapper_protoc_plugin - SUBDIRS *= src/murmur/murmur_grpc - } - SUBDIRS *= src/murmur -} - -CONFIG(tests) { - SUBDIRS *= src/tests -} 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) diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro deleted file mode 100644 index bc5687cec..000000000 --- a/overlay_gl/overlay_gl.pro +++ /dev/null @@ -1,65 +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>. - -# Overlay payload for Unix-like systems and OS X. - -include(../qmake/compiler.pri) - -TEMPLATE = lib -CONFIG -= qt gui -CONFIG *= debug_and_release -VERSION = 1.4.0 -SOURCES = overlay.c - -CONFIG(static) { - CONFIG -= static -} - -unix:!macx { - TARGET = mumble$(TARGET_ADD) - - DEFINES += TARGET_UNIX - linux* { - LIBS *= -lrt -ldl - } - QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD) - QMAKE_LFLAGS -= -Wl,--no-undefined - - QMAKE_LFLAGS -= -Wl,-z,now - QMAKE_LFLAGS += -Wl,-z,lazy - - QMAKE_LFLAGS *= $(LFLAGS_ADD) - equals(QMAKE_LINK,g++) { - QMAKE_LINK = gcc - QMAKE_LINK_SHLIB = gcc - } -} - -macx { - CONFIG *= x86_64 x86 plugin - CONFIG(universal) { - CONFIG *= ppc - } - - TARGET = mumbleoverlay$(TARGET_ADD) - - DEFINES += TARGET_MAC - QMAKE_CFLAGS *= -x objective-c - QMAKE_CFLAGS *= $(CFLAGS_ADD) - QMAKE_LFLAGS_PLUGIN *= -undefined dynamic_lookup -dynamic - QMAKE_LFLAGS += -framework CoreFoundation - QMAKE_LFLAGS += $(LFLAGS_ADD) - QMAKE_INFO_PLIST = overlay_gl.plist - - INCLUDEPATH *= ../3rdparty/mach-override-src - LIBS *= -lmach-override -} - - -DESTDIR = $$DESTDIR$(DESTDIR_ADD) - -QMAKE_LIBDIR = $$DESTDIR $$QMAKE_LIBDIR - -include(../qmake/symbols.pri) diff --git a/overlay_winx64/overlay_exe_winx64/overlay_exe_winx64.pro b/overlay_winx64/overlay_exe_winx64/overlay_exe_winx64.pro deleted file mode 100644 index c49787fe4..000000000 --- a/overlay_winx64/overlay_exe_winx64/overlay_exe_winx64.pro +++ /dev/null @@ -1,10 +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_64-toolchain -VPATH = ../../overlay/overlay_exe -TARGET = mumble_ol_helper_x64 - -include(../../overlay/overlay_exe/overlay_exe-shared.pro) diff --git a/overlay_winx64/overlay_winx64.pro b/overlay_winx64/overlay_winx64.pro deleted file mode 100644 index 2ce0883b1..000000000 --- a/overlay_winx64/overlay_winx64.pro +++ /dev/null @@ -1,10 +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_64-toolchain -VPATH = ../overlay -TARGET = mumble_ol_x64 - -include(../overlay/overlay-shared.pro) diff --git a/plugins/aoc/aoc.pro b/plugins/aoc/aoc.pro deleted file mode 100644 index 832d3910f..000000000 --- a/plugins/aoc/aoc.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>. - -include(../plugins.pri) - -TARGET = aoc -SOURCES = aoc.cpp diff --git a/plugins/arma2/arma2.pro b/plugins/arma2/arma2.pro deleted file mode 100644 index 25015e69b..000000000 --- a/plugins/arma2/arma2.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>. - -include(../plugins.pri) - -TARGET = arma2 -SOURCES = arma2.cpp diff --git a/plugins/bf1/bf1.pro b/plugins/bf1/bf1.pro deleted file mode 100644 index 7066a0089..000000000 --- a/plugins/bf1/bf1.pro +++ /dev/null @@ -1,4 +0,0 @@ -include(../plugins.pri) - -TARGET = bf1 -SOURCES = bf1.cpp diff --git a/plugins/bf1942/bf1942.pro b/plugins/bf1942/bf1942.pro deleted file mode 100644 index 8098652a1..000000000 --- a/plugins/bf1942/bf1942.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>. - -include(../plugins.pri) - -TARGET = bf1942 -SOURCES = bf1942.cpp diff --git a/plugins/bf2/bf2.pro b/plugins/bf2/bf2.pro deleted file mode 100644 index a23ebe368..000000000 --- a/plugins/bf2/bf2.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>. - -include(../plugins.pri) - -TARGET = bf2 -SOURCES = bf2.cpp diff --git a/plugins/bf2142/bf2142.pro b/plugins/bf2142/bf2142.pro deleted file mode 100644 index e2d189190..000000000 --- a/plugins/bf2142/bf2142.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>. - -include(../plugins.pri) - -TARGET = bf2142 -SOURCES = bf2142.cpp diff --git a/plugins/bf3/bf3.pro b/plugins/bf3/bf3.pro deleted file mode 100644 index 84467de69..000000000 --- a/plugins/bf3/bf3.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>. - -include(../plugins.pri) - -TARGET = bf3 -SOURCES = bf3.cpp diff --git a/plugins/bf4/bf4.pro b/plugins/bf4/bf4.pro deleted file mode 100644 index b41c3d419..000000000 --- a/plugins/bf4/bf4.pro +++ /dev/null @@ -1,4 +0,0 @@ -include(../plugins.pri) - -TARGET = bf4 -SOURCES = bf4.cpp diff --git a/plugins/bf4_x86/bf4_x86.pro b/plugins/bf4_x86/bf4_x86.pro deleted file mode 100644 index 06950a5f0..000000000 --- a/plugins/bf4_x86/bf4_x86.pro +++ /dev/null @@ -1,4 +0,0 @@ -include(../plugins.pri) - -TARGET = bf4_x86 -SOURCES = bf4_x86.cpp diff --git a/plugins/bfbc2/bfbc2.pro b/plugins/bfbc2/bfbc2.pro deleted file mode 100644 index 22c17fab9..000000000 --- a/plugins/bfbc2/bfbc2.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>. - -include(../plugins.pri) - -TARGET = bfbc2 -SOURCES = bfbc2.cpp diff --git a/plugins/bfheroes/bfheroes.pro b/plugins/bfheroes/bfheroes.pro deleted file mode 100644 index e78a7c2ce..000000000 --- a/plugins/bfheroes/bfheroes.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>. - -include(../plugins.pri) - -TARGET = bfheroes -SOURCES = bfheroes.cpp diff --git a/plugins/blacklight/blacklight.pro b/plugins/blacklight/blacklight.pro deleted file mode 100644 index 8caeada18..000000000 --- a/plugins/blacklight/blacklight.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>. - -include(../plugins.pri) - -TARGET = blacklight -SOURCES = blacklight.cpp diff --git a/plugins/borderlands/borderlands.pro b/plugins/borderlands/borderlands.pro deleted file mode 100644 index eed5bc173..000000000 --- a/plugins/borderlands/borderlands.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>. - -include(../plugins.pri) - -TARGET = borderlands -SOURCES = borderlands.cpp diff --git a/plugins/borderlands2/borderlands2.pro b/plugins/borderlands2/borderlands2.pro deleted file mode 100644 index ca29707b1..000000000 --- a/plugins/borderlands2/borderlands2.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>. - -include(../plugins.pri) - -TARGET = borderlands2 -SOURCES = borderlands2.cpp diff --git a/plugins/breach/breach.pro b/plugins/breach/breach.pro deleted file mode 100644 index e6b2132c1..000000000 --- a/plugins/breach/breach.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>. - -include(../plugins.pri) - -TARGET = breach -SOURCES = breach.cpp diff --git a/plugins/cod2/cod2.pro b/plugins/cod2/cod2.pro deleted file mode 100644 index 1e12229d9..000000000 --- a/plugins/cod2/cod2.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>. - -include(../plugins.pri) - -TARGET = cod2 -SOURCES = cod2.cpp diff --git a/plugins/cod4/cod4.pro b/plugins/cod4/cod4.pro deleted file mode 100644 index 27a0158d7..000000000 --- a/plugins/cod4/cod4.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>. - -include(../plugins.pri) - -TARGET = cod4 -SOURCES = cod4.cpp diff --git a/plugins/cod5/cod5.pro b/plugins/cod5/cod5.pro deleted file mode 100644 index d46a3bb73..000000000 --- a/plugins/cod5/cod5.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>. - -include(../plugins.pri) - -TARGET = cod5 -SOURCES = cod5.cpp diff --git a/plugins/codmw2/codmw2.pro b/plugins/codmw2/codmw2.pro deleted file mode 100644 index c5f283770..000000000 --- a/plugins/codmw2/codmw2.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>. - -include(../plugins.pri) - -TARGET = codmw2 -SOURCES = codmw2.cpp diff --git a/plugins/codmw2so/codmw2so.pro b/plugins/codmw2so/codmw2so.pro deleted file mode 100644 index e8da61173..000000000 --- a/plugins/codmw2so/codmw2so.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>. - -include(../plugins.pri) - -TARGET = codmw2so -SOURCES = codmw2so.cpp diff --git a/plugins/cs/cs.pro b/plugins/cs/cs.pro deleted file mode 100644 index 05b50afe4..000000000 --- a/plugins/cs/cs.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>. - -include(../plugins.pri) - -TARGET = cs -SOURCES = cs.cpp diff --git a/plugins/css/css.pro b/plugins/css/css.pro deleted file mode 100644 index 109ffb355..000000000 --- a/plugins/css/css.pro +++ /dev/null @@ -1,10 +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(../plugins.pri) - -DEFINES += "NULL_DESC=\"L\\\"CounterStrike : Source (Retracted, now using link)\\\"\"" -TARGET = css -SOURCES = ../null_plugin.cpp diff --git a/plugins/dods/dods.pro b/plugins/dods/dods.pro deleted file mode 100644 index 221b56a92..000000000 --- a/plugins/dods/dods.pro +++ /dev/null @@ -1,10 +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(../plugins.pri) - -DEFINES += "NULL_DESC=\"L\\\"Day of Defeat : Source (Retracted, now using link)\\\"\"" -TARGET = dods -SOURCES = ../null_plugin.cpp diff --git a/plugins/dys/dys.pro b/plugins/dys/dys.pro deleted file mode 100644 index 8842cb949..000000000 --- a/plugins/dys/dys.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>. - -include(../plugins.pri) - -TARGET = dys -SOURCES = dys.cpp diff --git a/plugins/etqw/etqw.pro b/plugins/etqw/etqw.pro deleted file mode 100644 index d35fd285c..000000000 --- a/plugins/etqw/etqw.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>. - -include(../plugins.pri) - -TARGET = etqw -SOURCES = etqw.cpp diff --git a/plugins/ffxiv/ffxiv.pro b/plugins/ffxiv/ffxiv.pro deleted file mode 100755 index 6c057e3d7..000000000 --- a/plugins/ffxiv/ffxiv.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>. - -include(../plugins.pri) - -TARGET = ffxiv -SOURCES = ffxiv.cpp diff --git a/plugins/ffxiv_x64/ffxiv_x64.pro b/plugins/ffxiv_x64/ffxiv_x64.pro deleted file mode 100755 index 2e0ec524a..000000000 --- a/plugins/ffxiv_x64/ffxiv_x64.pro +++ /dev/null @@ -1,11 +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(../plugins.pri) - -TARGET = ffxiv_x64 -SOURCES = ../ffxiv/ffxiv.cpp - -DEFINES *= FFXIV_USE_x64 diff --git a/plugins/gmod/gmod.pro b/plugins/gmod/gmod.pro deleted file mode 100644 index 548dc16c6..000000000 --- a/plugins/gmod/gmod.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>. - -include(../plugins.pri) - -TARGET = gmod -SOURCES = gmod.cpp diff --git a/plugins/gtaiv/gtaiv.pro b/plugins/gtaiv/gtaiv.pro deleted file mode 100644 index f66d443f6..000000000 --- a/plugins/gtaiv/gtaiv.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>. - -include(../plugins.pri) - -TARGET = gtaiv -SOURCES = gtaiv.cpp diff --git a/plugins/gtasa/gtasa.pro b/plugins/gtasa/gtasa.pro deleted file mode 100644 index 32cbf2a2d..000000000 --- a/plugins/gtasa/gtasa.pro +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2019-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(../plugins.pri) - -TARGET = gtasa -SOURCES = gtasa.cpp diff --git a/plugins/gtav/gtav.pro b/plugins/gtav/gtav.pro deleted file mode 100644 index 1ef2f8cc9..000000000 --- a/plugins/gtav/gtav.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>. - -include(../plugins.pri) - -TARGET = gtav -SOURCES = gtav.cpp diff --git a/plugins/gw/gw.pro b/plugins/gw/gw.pro deleted file mode 100644 index c9b8c59a0..000000000 --- a/plugins/gw/gw.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>. - -include(../plugins.pri) - -TARGET = gw -SOURCES = gw.cpp diff --git a/plugins/hl2dm/hl2dm.pro b/plugins/hl2dm/hl2dm.pro deleted file mode 100644 index efd0fe6df..000000000 --- a/plugins/hl2dm/hl2dm.pro +++ /dev/null @@ -1,10 +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(../plugins.pri) - -DEFINES += "NULL_DESC=\"L\\\"Half Life 2 Death Match (Retracted, now using link)\\\"\"" -TARGET = hl2dm -SOURCES = ../null_plugin.cpp diff --git a/plugins/insurgency/insurgency.pro b/plugins/insurgency/insurgency.pro deleted file mode 100644 index 8dbc50427..000000000 --- a/plugins/insurgency/insurgency.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>. - -include(../plugins.pri) - -TARGET = insurgency -SOURCES = insurgency.cpp diff --git a/plugins/jc2/jc2.pro b/plugins/jc2/jc2.pro deleted file mode 100755 index 81880ad88..000000000 --- a/plugins/jc2/jc2.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>. - -include(../plugins.pri) - -TARGET = jc2 -SOURCES = jc2.cpp diff --git a/plugins/l4d/l4d.pro b/plugins/l4d/l4d.pro deleted file mode 100644 index ba5625180..000000000 --- a/plugins/l4d/l4d.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>. - -include(../plugins.pri) - -TARGET = l4d -SOURCES = l4d.cpp diff --git a/plugins/l4d2/l4d2.pro b/plugins/l4d2/l4d2.pro deleted file mode 100644 index 040d4de98..000000000 --- a/plugins/l4d2/l4d2.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>. - -include(../plugins.pri) - -TARGET = l4d2 -SOURCES = l4d2.cpp diff --git a/plugins/link/link.pro b/plugins/link/link.pro deleted file mode 100644 index 90d8cbf44..000000000 --- a/plugins/link/link.pro +++ /dev/null @@ -1,20 +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(../plugins.pri) - -TARGET = link - -win32 { - SOURCES = link.cpp -} - -unix { - SOURCES = link-posix.cpp - - linux* { - LIBS += -lrt - } -} diff --git a/plugins/lol/lol.pro b/plugins/lol/lol.pro deleted file mode 100644 index cd7499e5f..000000000 --- a/plugins/lol/lol.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>. - -include(../plugins.pri) - -TARGET = lol -SOURCES = lol.cpp diff --git a/plugins/lotro/lotro.pro b/plugins/lotro/lotro.pro deleted file mode 100644 index 53cc99dd0..000000000 --- a/plugins/lotro/lotro.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>. - -include(../plugins.pri) - -TARGET = lotro -SOURCES = lotro.cpp diff --git a/plugins/plugins.pri b/plugins/plugins.pri deleted file mode 100644 index 70c60a5b1..000000000 --- a/plugins/plugins.pri +++ /dev/null @@ -1,23 +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 = lib -CONFIG += plugin debug_and_release warn_on -CONFIG -= qt -DIST *= mumble_plugin.h - -CONFIG(static) { - CONFIG -= static - CONFIG += shared - CONFIG += qt_dynamic_lookup -} - -win32:LIBS += -luser32 - -DESTDIR = $$DESTDIR/plugins - -include(../qmake/symbols.pri) diff --git a/plugins/plugins.pro b/plugins/plugins.pro deleted file mode 100644 index a493a814a..000000000 --- a/plugins/plugins.pro +++ /dev/null @@ -1,24 +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 = subdirs - -CONFIG += debug_and_release -SUBDIRS = link - -win32|linux { - SUBDIRS += aoc arma2 bf1942 bf2 bf3 bf2142 bfbc2 bfheroes bf4_x86 blacklight borderlands borderlands2 breach cod2 cod4 cod5 codmw2 codmw2so cs dys etqw ffxiv gmod gtaiv gtasa gw insurgency jc2 l4d l4d2 lol lotro ql rl sr ut2004 ut3 ut99 wolfet wow - - equals(MUMBLE_ARCH, x86_64) { - SUBDIRS += bf1 bf4 ffxiv_x64 gtav wow_x64 - } -} - -# Plugins which are now retracted were only released for Windows -win32 { - SUBDIRS += css dods hl2dm sto tf2 -} diff --git a/plugins/ql/ql.pro b/plugins/ql/ql.pro deleted file mode 100644 index a3158e1ea..000000000 --- a/plugins/ql/ql.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>. - -include(../plugins.pri) - -TARGET = ql -SOURCES = ql.cpp diff --git a/plugins/rl/rl.pro b/plugins/rl/rl.pro deleted file mode 100644 index 059f968e6..000000000 --- a/plugins/rl/rl.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>. - -include(../plugins.pri) - -TARGET = rl -SOURCES = rl.cpp diff --git a/plugins/sr/sr.pro b/plugins/sr/sr.pro deleted file mode 100644 index 523592195..000000000 --- a/plugins/sr/sr.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>. - -include(../plugins.pri) - -TARGET = sr -SOURCES = sr.cpp diff --git a/plugins/sto/sto.pro b/plugins/sto/sto.pro deleted file mode 100644 index f5e59fd72..000000000 --- a/plugins/sto/sto.pro +++ /dev/null @@ -1,10 +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(../plugins.pri) - -DEFINES += "NULL_DESC=\"L\\\"Star Trek Online (Retracted due to lack of maintenance)\\\"\"" -TARGET = sto -SOURCES = ../null_plugin.cpp diff --git a/plugins/tf2/tf2.pro b/plugins/tf2/tf2.pro deleted file mode 100644 index d82afc880..000000000 --- a/plugins/tf2/tf2.pro +++ /dev/null @@ -1,10 +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(../plugins.pri) - -DEFINES += "NULL_DESC=\"L\\\"Team Fortress 2 (Retracted, now using link)\\\"\"" -TARGET = tf2 -SOURCES = ../null_plugin.cpp diff --git a/plugins/ut2004/ut2004.pro b/plugins/ut2004/ut2004.pro deleted file mode 100644 index dec31a7a7..000000000 --- a/plugins/ut2004/ut2004.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>. - -include(../plugins.pri) - -TARGET = ut2004 -SOURCES = ut2004.cpp diff --git a/plugins/ut3/ut3.pro b/plugins/ut3/ut3.pro deleted file mode 100644 index 0996e45ff..000000000 --- a/plugins/ut3/ut3.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>. - -include(../plugins.pri) - -TARGET = ut3 -SOURCES = ut3.cpp diff --git a/plugins/ut99/ut99.pro b/plugins/ut99/ut99.pro deleted file mode 100644 index 73ca310f9..000000000 --- a/plugins/ut99/ut99.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>. - -include(../plugins.pri) - -TARGET = ut99 -SOURCES = ut99.cpp diff --git a/plugins/wolfet/wolfet.pro b/plugins/wolfet/wolfet.pro deleted file mode 100644 index 673283344..000000000 --- a/plugins/wolfet/wolfet.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>. - -include(../plugins.pri) - -TARGET = wolfet -SOURCES = wolfet.cpp diff --git a/plugins/wow/wow.pro b/plugins/wow/wow.pro deleted file mode 100644 index a49865860..000000000 --- a/plugins/wow/wow.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>. - -include(../plugins.pri) - -TARGET = wow -SOURCES = wow.cpp diff --git a/plugins/wow_x64/wow_x64.pro b/plugins/wow_x64/wow_x64.pro deleted file mode 100644 index 39f1618aa..000000000 --- a/plugins/wow_x64/wow_x64.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>. - -include(../plugins.pri) - -TARGET = wow_x64 -SOURCES = wow_x64.cpp diff --git a/qmake/builddir.pri b/qmake/builddir.pri deleted file mode 100644 index 65cc2955c..000000000 --- a/qmake/builddir.pri +++ /dev/null @@ -1,52 +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>. - -# Globally use "/debug" or "/release" as build directory, -# if it's not a shadow build, otherwise use the shadowed directory. -# -# https://wiki.qt.io/QMake-top-level-srcdir-and-builddir - -# Since this file is in the "qmake" directory, -# "$$PWD/.." is the top of the source tree. -# -# clean_path() is used to clean the path. -TOP_SRCDIR = $$clean_path($$PWD/..) - -# In case clean_path() doesn't return anything. -isEmpty(TOP_SRCDIR) { - TOP_SRCDIR = $$PWD/.. -} - -# shadowed() is used to retrieve the shadowed build path. -TOP_BUILDDIR = $$shadowed($$TOP_SRCDIR) - -# In case shadowed() doesn't return anything. -isEmpty(TOP_BUILDDIR) { - TOP_BUILDDIR = $$TOP_SRCDIR -} - -# If the build and source paths are equal, -# it's not a shadow build. -equals(TOP_BUILDDIR, $$TOP_SRCDIR) { - CONFIG(debug, debug|release) { - DESTDIR = $$TOP_BUILDDIR/debug - } - - CONFIG(release, debug|release) { - DESTDIR = $$TOP_BUILDDIR/release - } -} else { - DESTDIR = $$TOP_BUILDDIR -} - -OBJECTS_ROOT = $$DESTDIR/.obj -MOC_ROOT = $$DESTDIR/.moc -RCC_ROOT = $$DESTDIR/.qrc -UI_ROOT = $$DESTDIR/.ui - -OBJECTS_DIR = $$OBJECTS_ROOT/$$TARGET -MOC_DIR = $$MOC_ROOT/$$TARGET -RCC_DIR = $$RCC_ROOT/$$TARGET -UI_DIR = $$UI_ROOT/$$TARGET diff --git a/qmake/buildenv.pri b/qmake/buildenv.pri deleted file mode 100644 index 664cebfd5..000000000 --- a/qmake/buildenv.pri +++ /dev/null @@ -1,20 +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>. - -# This .pri detects whether Mumble is being built in a -# Mumble buildenv, and if so, sets the buildenv CONFIG. -# -# It also adds USE_BUILDENV as a preprocessor define -# such that code can detect the presence of a buildenv -# at build time. - -MUMBLE_PREFIX=$$(MUMBLE_PREFIX) -!isEmpty(MUMBLE_PREFIX) { - CONFIG += buildenv -} - -CONFIG(buildenv) { - DEFINES += USE_BUILDENV -} diff --git a/qmake/compiler.pri b/qmake/compiler.pri deleted file mode 100644 index 3a41e3a02..000000000 --- a/qmake/compiler.pri +++ /dev/null @@ -1,398 +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(qt.pri) -include(uname.pri) -include(buildenv.pri) -include(builddir.pri) -include(cplusplus.pri) -include(pkgconfig.pri) - -CONFIG *= warn_on - -# Enable zlib compression for assets -# embedded via rcc. This is done to -# keep the size of rcc's output -# source files under control. -QMAKE_RESOURCE_FLAGS += -compress 9 - -# The architecture we're building for. -# On Windows, Mumble supports overriding the -# architecture of the compiler via the -# force-x86_64-toolchain and force-x86-toolchain -# CONFIG options. Because we have these, qmake's -# QT_ARCH doesn't suffice any longer, and -# we define MUMBLE_ARCH to be used in its place. -MUMBLE_ARCH = $$QT_ARCH -# QT_ARCH uses 'i386' instead of 'x86', -# so map that value back to what we expect. -equals(MUMBLE_ARCH, i386) { - MUMBLE_ARCH=x86 -} - -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-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 - # architecture, regardless of the actual architecture - # used by the current build environment. - FULL_MKSPEC_PATH = $$QMAKESPEC - CURRENT_MKSPEC = $$basename(QMAKESPEC) - - CONFIG(force-x86-toolchain) { - MUMBLE_ARCH = x86 - include(toolchain/$${CURRENT_MKSPEC}/x86-xp.toolchain) - } - - CONFIG(force-x86_64-toolchain) { - MUMBLE_ARCH = x86_64 - include(toolchain/$${CURRENT_MKSPEC}/x64.toolchain) - } - - # Import dependency paths for windows - include(winpaths_default.pri) - - INCLUDEPATH *= "$$BOOST_PATH/include" - QMAKE_LIBDIR *= "$$OPENSSL_PATH/lib" "$$LIBSNDFILE_PATH/lib" "$$BOOST_PATH/lib" - INCLUDEPATH *= "$$OPENSSL_PATH/include" "$$LIBSNDFILE_PATH/include" - - # Sanity check that LIB and INCLUDE are properly set up. - INCLUDE_VAR=$$(INCLUDE) - LIB_VAR=$$(LIB) - isEmpty(LIB_VAR) { - error("The LIB environment variable is not set. Are you not in a build environment?") - } - isEmpty(INCLUDE_VAR) { - error("The INCLUDE environment variable is not set. Are you not in a build environment?") - } - - CONFIG(analyze) { - QMAKE_CFLAGS_DEBUG *= /analyze - QMAKE_CXXFLAGS_DEBUG *= /analyze - QMAKE_CFLAGS_RELEASE *= /analyze - QMAKE_CXXFLAGS_RELEASE *= /analyze - } - - # Always enable warnings-as-errors - # if we're inside a Mumble build environment. - # Can be disabled with CONFIG+=no-warnings-as-errors. - CONFIG(buildenv):!CONFIG(no-warnings-as-errors) { - CONFIG += warnings-as-errors - } - - CONFIG(warnings-as-errors) { - QMAKE_CFLAGS *= -WX - QMAKE_CXXFLAGS *= -WX - QMAKE_LFLAGS *= -WX - } - - # Increase the verbosity of the linker. - # For now, only increases the verbosity - # of searching for libraries. - # This is useful when diagnosing libraries - # that use a wrong runtime library DLL. - CONFIG(verbose-linker) { - QMAKE_LFLAGS *= /VERBOSE:LIB - } - - # Increase PCH heap to 150MB: https://msdn.microsoft.com/en-us/library/bdscwf1c.aspx - QMAKE_CFLAGS *= -Zm200 - QMAKE_CXXFLAGS *= -Zm200 - - # Disable C4091 for x86 builds. We build against the v140_xp toolset, which uses - # a modified Windows 7 SDK which is compatible with Windows XP. Many system headers - # emit C4091, typically because of erroneous typedefs. For example 'GPFIDL_FLAGS' in - # shlobj.h, and an anonymous enum that includes KSPROPERTY_ONESHOT_RECONNECT in ksmedia.h. - equals(MUMBLE_ARCH, x86) { - QMAKE_CFLAGS *= -wd4091 - QMAKE_CXXFLAGS *= -wd4091 - } - - QMAKE_CFLAGS_RELEASE *= -Ox /fp:fast - QMAKE_CXXFLAGS_RELEASE *= -Ox /fp:fast - - equals(MUMBLE_ARCH, x86) { - QMAKE_LFLAGS_RELEASE -= /SafeSEH - } - - # MSVS 2012 and 2013's cl.exe will generate SSE2 code by default, - # unless an explict arch is set. - # For our non-64 x86 builds, our binaries should not contain any - # SSE2 code, so override the default by using -arch:SSE. - equals(MUMBLE_ARCH, x86) { - QMAKE_CFLAGS_RELEASE *= -arch:SSE - QMAKE_CXXFLAGS_RELEASE *= -arch:SSE - } - - # Qt 5.4 uses -Zc:strictStrings by default on MSVS 2013. - # TextToSpeech_win.cpp uses sapi.h, which isn't compatible - # with the strictStrings option due to bad conversions - # in some of its functions's default parameters. - QMAKE_CFLAGS_RELEASE -= -Zc:strictStrings - QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -Zc:strictStrings - QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -Zc:strictStrings - # The mkspec update for MSVC2015 puts the flag directly in - # CFLAGS and CXXFLAGS, so try there, too. - QMAKE_CFLAGS -= -Zc:strictStrings - QMAKE_CXXFLAGS -= -Zc:strictStrings - - # Explicitly set the subsystem versions to - # 5.01 (XP) for x86 and 6.00 (Vista) for x64. - # - # Qt expands the @QMAKE_SUBSYSTEM_SUFFIX@ via - # qt_config.prf, which doesn't seem to trigger - # for us. So we'll just try our luck. - QMAKE_LFLAGS_CONSOLE -= /SUBSYSTEM:CONSOLE - QMAKE_LFLAGS_CONSOLE -= /SUBSYSTEM:CONSOLE@QMAKE_SUBSYSTEM_SUFFIX@ - QMAKE_LFLAGS_WINDOWS -= /SUBSYSTEM:WINDOWS - QMAKE_LFLAGS_WINDOWS -= /SUBSYSTEM:WINDOWS@QMAKE_SUBSYSTEM_SUFFIX@ - !isEmpty(QMAKE_LFLAGS_WINDOWS) { - error("QMAKE_LFLAGS_WINDOWS is not empty. Please adjust the pri file.") - } - !isEmpty(QMAKE_LFLAGS_CONSOLE) { - error("QMAKE_LFLAGS_CONSOLE is not empty. Please adjust the pri file.") - } - equals(MUMBLE_ARCH, x86) { - QMAKE_LFLAGS_CONSOLE += /SUBSYSTEM:CONSOLE,5.01 - QMAKE_LFLAGS_WINDOWS += /SUBSYSTEM:WINDOWS,5.01 - } - equals(MUMBLE_ARCH, x86_64) { - QMAKE_LFLAGS_CONSOLE += /SUBSYSTEM:CONSOLE,6.00 - QMAKE_LFLAGS_WINDOWS += /SUBSYSTEM:WINDOWS,6.00 - } - - DEFINES *= RESTRICT= - CONFIG(sse2) { - QMAKE_CFLAGS_RELEASE -= -arch:SSE - QMAKE_CFLAGS_DEBUG -= -arch:SSE - QMAKE_CFLAGS += -arch:SSE2 - } - - # The mkspec update for MSVC2015 sets "/Z7", - # which bakes debug info into binaries. - # We, instead, want that only for the build environment. - QMAKE_CFLAGS -= -Z7 - QMAKE_CXXFLAGS -= -Z7 - - CONFIG(symbols) { - # Configure build to be able to properly debug release builds - # (https://msdn.microsoft.com/en-us/library/fsk896zz.aspx). - # This includes explicitely disabling /Oy to help debugging - # (https://msdn.microsoft.com/en-us/library/2kxx5t2c.aspx). - # Also set /Zo to enhance optimized debugging - # (https://msdn.microsoft.com/en-us/library/dn785163.aspx?f=255&MSPPError=-2147217396). - QMAKE_CFLAGS_RELEASE -= -Oy - QMAKE_CXXFLAGS_RELEASE -= -Oy - - QMAKE_CFLAGS_RELEASE *= -GR -Zi -Zo -Oy- - QMAKE_CXXFLAGS_RELEASE *= -GR -Zi -Zo -Oy- - - QMAKE_LFLAGS *= /DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO - } - - CONFIG(vld) { - CONFIG(debug, debug|release) { - DEFINES *= USE_VLD - INCLUDEPATH *= "$$VLD_PATH/include" - QMAKE_LIBDIR *= "$$VLD_PATH/lib" - } - } -} - -unix|win32-g++ { - DEFINES *= RESTRICT=__restrict__ - QMAKE_CFLAGS *= -fvisibility=hidden - QMAKE_CXXFLAGS *= -fvisibility=hidden - QMAKE_OBJECTIVE_CFLAGS *= -fvisibility=hidden - QMAKE_OBJECTIVE_CXXFLAGS *= -fvisibility=hidden - - QMAKE_CFLAGS *= -Wall -Wextra - QMAKE_CXXFLAGS *= -Wall -Wextra - QMAKE_OBJECTIVE_CFLAGS *= -Wall -Wextra - QMAKE_OBJECTIVE_CXXFLAGS *= -Wall -Wextra - - # Always enable warnings-as-errors - # if we're inside a Mumble build environment. - # Can be disabled with CONFIG+=no-warnings-as-errors. - CONFIG(buildenv):!CONFIG(no-warnings-as-errors) { - CONFIG += warnings-as-errors - } - - CONFIG(warnings-as-errors) { - QMAKE_CFLAGS *= -Werror - QMAKE_CXXFLAGS *= -Werror - QMAKE_OBJECTIVE_CFLAGS *= -Werror - QMAKE_OBJECTIVE_CXXFLAGS *= -Werror - } - - CONFIG(opt-gcc) { - QMAKE_CC = /opt/gcc/bin/gcc - QMAKE_CXX = /opt/gcc/bin/g++ - QMAKE_LINK = /opt/gcc/bin/g++ - } - - CONFIG(optgen) { - QMAKE_CFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-generate - QMAKE_CXXFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-generate - QMAKE_OBJECTIVE_CFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-generate - QMAKE_OBJECTIVE_CXXFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-generate - QMAKE_LFLAGS *= -fprofile-generate - } - - CONFIG(optimize) { - QMAKE_CFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-use - QMAKE_CXXFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-use - QMAKE_OBJECTIVE_CFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-use - QMAKE_OBJECTIVE_CXXFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-use - } -} - -contains(UNAME, FreeBSD)|contains(UNAME, OpenBSD) { - QMAKE_CFLAGS *= "-I/usr/local/include" "-isystem /usr/local/include" - QMAKE_CXXFLAGS *= "-I/usr/local/include" "-isystem /usr/local/include" - QMAKE_LIBDIR *= /usr/lib - QMAKE_LIBDIR *= /usr/local/lib -} - -unix:!macx { - # If we're building in a Mumble build environment, - # add its include and lib dirs to the build configuration. - CONFIG(buildenv) { - SYSTEM_INCLUDES = $$(MUMBLE_PREFIX)/include $$[QT_INSTALL_HEADERS] - QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/lib - - for(inc, $$list($$SYSTEM_INCLUDES)) { - QMAKE_CFLAGS *= "-I$$inc" "-isystem $$inc" - QMAKE_CXXFLAGS += "-I$$inc" "-isystem $$inc" - } - } - - CONFIG(dpkg-buildflags) { - QMAKE_CFLAGS *= $$system(dpkg-buildflags --get CFLAGS) - QMAKE_CXXFLAGS *= $$system(dpkg-buildflags --get CXXFLAGS) - QMAKE_CPPFLAGS *= $$system(dpkg-buildflags --get CPPFLAGS) - QMAKE_LFLAGS *= $$system(dpkg-buildflags --get LDFLAGS) - } - - CONFIG(debug, debug|release) { - QMAKE_CFLAGS *= -fstack-protector -fPIE - QMAKE_CXXFLAGS *= -fstack-protector -fPIE - QMAKE_LFLAGS *= -pie - QMAKE_LFLAGS *= -Wl,--no-add-needed - } - - # Ensure _FORTIFY_SOURCE is not used in debug builds. - # - # First, ensure _FORTIFY_SOURCE is undefined. - # Then -- and, only for release builds -- set - # _FORTIFY_SOURCE=2. - # - # We can't use _FORTIFY_SOURCE in debug builds (which are - # built with -O0) because _FORTIFY_SOURCE=1 requires -O1 - # and _FORTIFY_SOURCE=2 requires -O2. - # Modern GLIBCs warn about this since - # https://sourceware.org/bugzilla/show_bug.cgi?id=13979. - # In Mumble builds with warnings-as-errors, this will - # cause build failures. - # - # We use the += operator because we care about the - # ordering of unsetting versus setting the preprocessor - # define. If they're in the wrong order, this will not - # work as intended. - QMAKE_CFLAGS += -U_FORTIFY_SOURCE - QMAKE_CXXFLAGS += -U_FORTIFY_SOURCE - CONFIG(release, debug|release) { - QMAKE_CFLAGS += -D_FORTIFY_SOURCE=2 - QMAKE_CXXFLAGS += -D_FORTIFY_SOURCE=2 - } - - QMAKE_LFLAGS *= -Wl,-z,relro -Wl,-z,now - - CONFIG(symbols) { - QMAKE_CFLAGS *= -g - QMAKE_CXXFLAGS *= -g - } -} - -macx { - SYSTEM_INCLUDES = $$(MUMBLE_PREFIX)/include $$[QT_INSTALL_HEADERS] - QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/lib - - for(inc, $$list($$SYSTEM_INCLUDES)) { - QMAKE_CFLAGS += "-I$$inc" "-isystem $$inc" - QMAKE_CXXFLAGS += "-I$$inc" "-isystem $$inc" - QMAKE_OBJECTIVE_CFLAGS += "-I$$inc" "-isystem $$inc" - QMAKE_OBJECTIVE_CXXFLAGS += "-I$$inc" "-isystem $$inc" - } - - !CONFIG(universal) { - CONFIG += no-pch - - QMAKE_MAC_SDK = macosx - QMAKE_CC = $$system(xcrun -find clang) - QMAKE_CXX = $$system(xcrun -find clang++) - QMAKE_LINK = $$system(xcrun -find clang++) - - MUMBLE_TARGET_MACOS_VERSION = 10.9 - - QMAKE_MACOSX_DEPLOYMENT_TARGET = $$MUMBLE_TARGET_MACOS_VERSION - QMAKE_CFLAGS += -mmacosx-version-min=$$MUMBLE_TARGET_MACOS_VERSION - QMAKE_CXXFLAGS += -mmacosx-version-min=$$MUMBLE_TARGET_MACOS_VERSION - QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=$$MUMBLE_TARGET_MACOS_VERSION - QMAKE_OBJECTIVE_CXXFLAGS += -mmacosx-version-min=$$MUMBLE_TARGET_MACOS_VERSION - } else { - XCODE_PATH=$$system(xcode-select -print-path) - CONFIG += x86 ppc no-cocoa - QMAKE_MAC_SDK = $${XCODE_PATH}/SDKs/MacOSX10.5.sdk - QMAKE_CC = $${XCODE_PATH}/usr/bin/gcc-4.2 - QMAKE_CXX = $${XCODE_PATH}/usr/bin/g++-4.2 - QMAKE_LINK = $${XCODE_PATH}/usr/bin/g++-4.2 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 - QMAKE_CFLAGS += -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 - QMAKE_CXXFLAGS += -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 - QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 - QMAKE_OBJECTIVE_CXXFLAGS += -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 - DEFINES += USE_MAC_UNIVERSAL - } - - QMAKE_LFLAGS += -Wl,-dead_strip -framework Cocoa -framework Carbon - - CONFIG(symbols) { - QMAKE_CFLAGS *= -gfull -gdwarf-2 - QMAKE_CXXFLAGS *= -gfull -gdwarf-2 - QMAKE_OBJECTIVE_CFLAGS *= -gfull -gdwarf-2 - QMAKE_OBJECTIVE_CXXFLAGS *= -gfull -gdwarf-2 - } -} - -CONFIG(clang-analyzer) { - QMAKE_CC = $$(CC) - QMAKE_CXX = $$(CXX) -} - -CONFIG(no-pch) { - CONFIG -= precompile_header -} else { - CONFIG *= precompile_header -} - -CONFIG(debug, debug|release) { - DEFINES *= SNAPSHOT_BUILD -} diff --git a/qmake/cplusplus.pri b/qmake/cplusplus.pri deleted file mode 100644 index fbf0bae55..000000000 --- a/qmake/cplusplus.pri +++ /dev/null @@ -1,78 +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>. - -# We enforce (at least) cpp14 -CONFIG *= c++14 - -# If CONFIG(c++1z) or CONFIG(c++14) is set, we -# also add the prior "modern" standards to -# CONFIG. -# -# This is because Qt 5.6 (and maybe earlier -# versions) use the presence of CONFIG(c++11) -# to mean "modern C++". -# -# For example, Qt 5.6's -# mkspecs/features/qt_module_headers.prf -# file will automatically add -std=c++98 to -# CXXFLAGS if CONFIG(c++11) isn't set. -# -# The result is that if we ONLY put c++1z in -# CONFIG, that check will cause us to have -# *both* -std=c++98 *and* -std=gnu++1z in -# CXXFLAGS when building on Qt 5.6, which -# is bad. -# -# In order to be compatible with such checks, -# ensure that we have all prior "modern" -# C++ standards in CONFIG, to please Qt. -CONFIG(c++1z) { - CONFIG *= c++11 c++14 -} -CONFIG(c++14) { - CONFIG *= c++11 -} - -# Unix-specific handling of modern C++ features. -unix { - # No Qt versions know about CONFIG(c++03), since - # its our own internal hint -- so for CONFIG(c++03) - # we set QMAKE_CXXFLAGS and QMAKE_LFLAGS. - CONFIG(c++03):!CONFIG(c++11):!CONFIG(c++14):!CONFIG(c++1z) { - # Note: we use -std=c++98 to support - # older compilers. In GCC, the following - # flags mean the same thing: - # -std=c++98, -std=c++03, -ansi. - QMAKE_CXXFLAGS += -std=c++98 - QMAKE_LFLAGS += -std=c++98 - } - - - # Debian seems to put C++11 variants of shared libraries - # in /usr/lib/$triple/c++11. - # - # At least, that's the case for ZeroC Ice. - # - # The expectation is that this is a general convention, - # so add it to our library search path in C++11, C++14 - # and C++1z mode. - CONFIG(c++11)|CONFIG(c++14)|CONFIG(c++1z) { - MULTIARCH_TRIPLE = $$system($${QMAKE_CC} -print-multiarch 2>/dev/null) - !isEmpty(MULTIARCH_TRIPLE) { - # Don't add the Debian-specfic c++11 libdir when using - # a Mumble buildenv. - # - # Adding this directory to QMAKE_LIBDIR this early in - # the build process will cause Mumble to prefer this - # lib dir to the buildenv's own. - # The easiest way to fix this is to simply avoid adding - # this dir when building using a Mumble buildenv, since - # it is irrelevant for us in that setting. - !CONFIG(buildenv) { - QMAKE_LIBDIR *= /usr/lib/$${MULTIARCH_TRIPLE}/c++11 - } - } - } -} diff --git a/qmake/lrelease.pri b/qmake/lrelease.pri deleted file mode 100644 index 696f8fa6a..000000000 --- a/qmake/lrelease.pri +++ /dev/null @@ -1,16 +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>. - -# This .pri file finds the correct lrelease binary name on the system. - -isEmpty(QMAKE_LRELEASE) { - equals(QMAKE_HOST.os, "Windows")|equals(QMAKE_VERSION_INT_MAJOR, 4):win32 { - MY_QT_INSTALL_BINS = $$[QT_INSTALL_BINS] - WINDOWS_QT_INSTALL_BINS = $$replace(MY_QT_INSTALL_BINS, $$quote(/), $$quote(\\)) - QMAKE_LRELEASE = $$WINDOWS_QT_INSTALL_BINS\\lrelease.exe - } else { - QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease - } -} diff --git a/qmake/openssl.pri b/qmake/openssl.pri deleted file mode 100644 index 23e67a424..000000000 --- a/qmake/openssl.pri +++ /dev/null @@ -1,33 +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(pkgconfig.pri) - -# Include this file to portably link -# against OpenSSL. -# -# It requires compiler.pri to be included -# for $$OPENSSL_PATH, etc. to work on win32. -# This file can't include compiler.pri: it can -# only be included once per .pro file. - -win32-msvc* { - INCLUDEPATH *= "$$OPENSSL_PATH/include" - QMAKE_LIBDIR *= "$$OPENSSL_PATH/lib" - LIBS *= -lgdi32 -llibeay32 -lssleay32 -} - -win32-g++ { - LIBS *= -lssl -lcrypto -lgdi32 -} - -unix { - contains(UNAME, FreeBSD) { - LIBS *= -lcrypto -lssl - } else { - CONFIG *= link_pkgconfig - must_pkgconfig(openssl) - } -} diff --git a/qmake/pkgconfig.pri b/qmake/pkgconfig.pri deleted file mode 100644 index d561d9172..000000000 --- a/qmake/pkgconfig.pri +++ /dev/null @@ -1,30 +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>. - -# Allow cross-building by making a call to return the pkg-config -# that the user supplied to the build. -PKG_CONFIG = $$pkgConfigExecutable() - -# must_pkgconfig(pkg) -# -# This function checks if the passed-in package -# name is available on the system. If it is, -# it is added to the PKGCONFIG variable. -# If not, exit qmake with a fatal error stating -# that the package could not be found. -# -# Example usage: -# -# must_pkgconfig(openssl) -# -defineTest(must_pkgconfig) { - pkg = $$1 - system($$PKG_CONFIG --exists $$pkg) { - PKGCONFIG *= $$pkg - export(PKGCONFIG) - } else { - error(pkg-config could not find package $$pkg) - } -} diff --git a/qmake/protobuf.pri b/qmake/protobuf.pri deleted file mode 100644 index ef2a3b25c..000000000 --- a/qmake/protobuf.pri +++ /dev/null @@ -1,39 +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(pkgconfig.pri) - -# Include this file to portably link -# against protobuf. -# -# It requires compiler.pri to be included -# for $$PROTOBUF_PATH, etc. to work on win32. -# This file can't include compiler.pri: it can -# only be included once per .pro file. - -win32-msvc* { - # Legacy win32-static paths (protobuf 2.x) - INCLUDEPATH *= "$$PROTOBUF_PATH/vsprojects/include" "$$PROTOBUF_PATH/src" protobuf - CONFIG(debug, debug|release) { - QMAKE_LIBDIR *= "$$PROTOBUF_PATH/vsprojects/Debug" - } else { - QMAKE_LIBDIR *= "$$PROTOBUF_PATH/vsprojects/Release" - } - - # New win32-static paths (protobuf 3.2+) - INCLUDEPATH *= "$$PROTOBUF_PATH/include" - QMAKE_LIBDIR *= "$$PROTOBUF_PATH/lib" - - LIBS *= -llibprotobuf -} - -win32-g++ { - LIBS *= -lprotobuf -} - -unix { - CONFIG *= link_pkgconfig - must_pkgconfig(protobuf) -} diff --git a/qmake/protoc.pri b/qmake/protoc.pri deleted file mode 100644 index 1a9419558..000000000 --- a/qmake/protoc.pri +++ /dev/null @@ -1,67 +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>. - -# This .pri files finds a suitable protoc binary on the system. -# -# It exposes the found protoc binary as the 'PROTOC' qmake variable. -# This variable contains the absolute path to a working protoc binary. -# -# Why do we need to do this? -# -# The protobuf compiler's binary name in MinGW packages for Linux -# cross-compiling is never 'protoc', but something like -# 'x86_64-w64-mingw32.static-protoc'. -# -# This file tries to use the right binary, by searching in $PATH -# using the 'which' tool. -# -# If no binary is found, an error is shown to the user. -# -# This script also supports setting a MUMBLE_PROTOC environment -# variable to specify an absolute path to a protoc binary to use. -# Setting this environment variable overrides any querying. - -include(qt.pri) - -PROTOC = $$(MUMBLE_PROTOC) - -# If the MUMBLE_PROTOC environment variable isn't set -isEmpty(PROTOC) { - # If we're on Qt 4 on win32, or we're building from Windows, use "protoc" - equals(QMAKE_HOST.os, "Windows")|equals(QMAKE_VERSION_INT_MAJOR, 4):win32 { - PROTOC=protoc - } else { - # Determine if the 'which' tool is available. We need it - # to determine which PROTOC binary on the system to use. - # If 'which' isn't available, error out. - # Calling 'which which' is intentional. - # If which is available, it will print the path to it. - # If it isn't available, it will not print anything. - WHICH=$$system(which which 2>/dev/null) - isEmpty(WHICH) { - message("The 'which' command is not available on the system. Unable to search for protoc installations. Assuming 'protoc'... If this is not correct, please point the MUMBLE_PROTOC environment variable at a working protoc binary.") - PROTOC=protoc - } else { - TARGET_TRIPLE = $$system($${QMAKE_CC} -dumpmachine 2>/dev/null) - !isEmpty(TARGET_TRIPLE) { - isEmpty(PROTOC) { - PROTOC=$$system(which $$TARGET_TRIPLE"-protoc" 2>/dev/null) - } - isEmpty(PROTOC) { - PROTOC=$$system(which $$TARGET_TRIPLE".static-protoc" 2>/dev/null) - } - isEmpty(PROTOC) { - PROTOC=$$system(which $$TARGET_TRIPLE".shared-protoc" 2>/dev/null) - } - } - isEmpty(PROTOC) { - PROTOC=$$system(which protoc 2>/dev/null) - } - isEmpty(PROTOC) { - error("Unable to find system's protoc binary. Some scripts invoked during the Mumble build use the protobuf compiler. You can manually specify it via the MUMBLE_PROTOC environment variable.") - } - } - } -} diff --git a/qmake/python.pri b/qmake/python.pri deleted file mode 100644 index 5a75c6a24..000000000 --- a/qmake/python.pri +++ /dev/null @@ -1,87 +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>. - -# This .pri files finds a suitable Python binary on the system. -# -# It exposes the found Python binary as the 'PYTHON' qmake variable. -# This variable contains the absolute path to a working Python binary. -# -# Why do we need to do this? -# -# Some systems (for example, OpenBSD's Python port), are not -# PEP 394 (https://www.python.org/dev/peps/pep-0394/) compliant. -# -# This means that there is no 'python', 'python2' or 'python3' -# binaries in the $PATH. -# -# On those systems, we can't rely on a '#!/usr/bin/env python2' -# or similar shebang. We have to query the system for versioned -# Python binaries like "python2.7" instead. -# -# This file does that, by searching in $PATH using the 'which' -# tool. -# -# If no binary is found, an error is shown to the user. -# -# This script also supports setting a MUMBLE_PYTHON environment -# variable to specify an absolute path to a Python binary to use. -# Setting this environment variable overrides any querying. - -include(qt.pri) - -PYTHON = $$(MUMBLE_PYTHON) - -# If the MUMBLE_PYTHON environment variable isn't set -isEmpty(PYTHON) { - # If we're on Qt 4 on win32, or we're building from Windows, use "python" - equals(QMAKE_HOST.os, "Windows")|equals(QMAKE_VERSION_INT_MAJOR, 4):win32 { - PYTHON=python - } else { - # Determine if the 'which' tool is available. We need it - # to determine which python binary on the system to use. - # If 'which' isn't available, error out. - # Calling 'which which' is intentional. - # If which is available, it will print the path to it. - # If it isn't available, it will not print anything. - WHICH=$$system(which which 2>/dev/null) - isEmpty(WHICH) { - message("The 'which' command is not available on the system. Unable to search for Python installations. Assuming 'python'... If this is not correct, please point the MUMBLE_PYTHON environment variable at a working Python 2 or Python 3 binary.") - PYTHON=python - } - isEmpty(PYTHON) { - PYTHON=$$system(which python 2>/dev/null) - } - isEmpty(PYTHON) { - PYTHON=$$system(which python2 2>/dev/null) - } - isEmpty(PYTHON) { - PYTHON=$$system(which python2.7 2>/dev/null) - } - isEmpty(PYTHON) { - PYTHON=$$system(which python3 2>/dev/null) - } - isEmpty(PYTHON) { - PYTHON=$$system(which python3.0 2>/dev/null) - } - isEmpty(PYTHON) { - PYTHON=$$system(which python3.1 2>/dev/null) - } - isEmpty(PYTHON) { - PYTHON=$$system(which python3.2 2>/dev/null) - } - isEmpty(PYTHON) { - PYTHON=$$system(which python3.3 2>/dev/null) - } - isEmpty(PYTHON) { - PYTHON=$$system(which python3.4 2>/dev/null) - } - isEmpty(PYTHON) { - PYTHON=$$system(which python3.5 2>/dev/null) - } - isEmpty(PYTHON) { - error("Unable to find the system's Python binary. Some scripts invoked during the Mumble build use Python. You can manually specify it via the MUMBLE_PYTHON environment variable (either 2 or 3).") - } - } -} diff --git a/qmake/qt.pri b/qmake/qt.pri deleted file mode 100644 index b5519b766..000000000 --- a/qmake/qt.pri +++ /dev/null @@ -1,24 +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>. - -QT_VERSION_INT_MAJOR = $$QT_MAJOR_VERSION - -greaterThan(QT_MINOR_VERSION, 99) { - error(bad Qt minor version) -} greaterThan(QT_MINOR_VERSION, 9) { - QT_VERSION_INT_MINOR = "$$QT_MINOR_VERSION" -} else { - QT_VERSION_INT_MINOR = "0$$QT_MINOR_VERSION" -} - -greaterThan(QT_PATCH_VERSION, 99) { - error(bad Qt patch version) -} greaterThan(QT_PATCH_VERSION, 9) { - QT_VERSION_INT_PATCH = "$$QT_PATCH_VERSION" -} else { - QT_VERSION_INT_PATCH = "0$$QT_PATCH_VERSION" -} - -QT_VERSION_INT = "$$QT_VERSION_INT_MAJOR$$QT_VERSION_INT_MINOR$$QT_VERSION_INT_PATCH" diff --git a/qmake/rcc.pri b/qmake/rcc.pri deleted file mode 100644 index 30045e7e8..000000000 --- a/qmake/rcc.pri +++ /dev/null @@ -1,29 +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>.
-
-# Use a custom tool to query for RCC dependencies.
-# Qt's regular invocation of "rcc -list" doesn't work with
-# .qrc files that contain references to non-existent files.
-# Our .qrc files do that, because we auto-generate some of
-# the files at make-time.
-
-# Override RCC_DIR to be 'debug' or 'release'.
-# We have to do this because we're loading the
-# 'resources' feature a bit earlier than usual.
-# By default, Qt would have set these itself.
-
-include(python.pri)
-
-CONFIG(debug, debug|release) {
- RCC_DIR = debug
-}
-CONFIG(release, debug|release) {
- RCC_DIR = release
-}
-
-load(resources)
-
-RCC_DEPENDS = $$escape_expand(\")$${PWD}/../scripts/rcc-depends.py$$escape_expand(\")
-rcc.depend_command = $${PYTHON} $${RCC_DEPENDS} ${QMAKE_FILE_IN}
diff --git a/qmake/symbols.pri b/qmake/symbols.pri deleted file mode 100644 index 138e50e65..000000000 --- a/qmake/symbols.pri +++ /dev/null @@ -1,42 +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(symbols):macx { - DSYM_DESTDIR = $${DESTDIR} - - contains(TEMPLATE, 'app') { - DSYM_TARGET_FULLPATH = ${TARGET} - DSYM_OUT = $${DSYM_DESTDIR}/symbols/${QMAKE_TARGET}.dSYM - CONFIG(app_bundle) { - DSYM_OUT = $${DSYM_DESTDIR}/symbols/${QMAKE_TARGET}.app.dSYM - } - } - - contains(TEMPLATE, 'lib') { - DSYM_TARGET_FULLPATH = $${DESTDIR}/${TARGET} - DSYM_OUT = $${DSYM_DESTDIR}/symbols/${TARGET}.dSYM - CONFIG(plugin_bundle) { - DSYM_TARGET_FULLPATH = ${DESTDIR}${TARGET}$${QMAKE_BUNDLE_EXTENSION}/Contents/MacOS/${TARGET} - DSYM_OUT = $${DSYM_DESTDIR}/symbols/${TARGET}$${QMAKE_BUNDLE_EXTENSION}.dSYM - } - } - - dsym.target = $${DSYM_OUT} - dsym.commands = $(MKDIR) $${DSYM_DESTDIR}/symbols/ && dsymutil $${DSYM_TARGET_FULLPATH} -o $${DSYM_OUT} - dsym.depends = $${DSYM_TARGET_FULLPATH} - dsym.CONFIG = recursive - QMAKE_EXTRA_TARGETS *= dsym - QMAKE_DISTCLEAN *= $${DSYM_OUT} - - strip.target = stripdebug - strip.commands = strip -S $${DSYM_TARGET_FULLPATH} - strip.depends = $${DSYM_OUT} - strip.CONFIG = recursive - QMAKE_EXTRA_TARGETS *= strip - - !CONFIG(staticlib) { - ALL_DEPS += $${DSYM_OUT} stripdebug - } -} diff --git a/qmake/toolchain/win32-msvc2013/x64.toolchain b/qmake/toolchain/win32-msvc2013/x64.toolchain deleted file mode 100644 index a78b5f1d6..000000000 --- a/qmake/toolchain/win32-msvc2013/x64.toolchain +++ /dev/null @@ -1,41 +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>.
-
-# This file describes the x64 toolchain of
-# MSVC2013 compiler.
-#
-# This file can be included in a .pro file
-# to cause the target in that file to be
-# built for the x64 architecture, regardless
-# of the native architecture of the build
-# environment.
-
-# Use the x86-based amd64 cross compiler by default.
-QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\x86_amd64\\cl.exe\""
-QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\x86_amd64\\cl.exe\""
-QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\x86_amd64\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\x86_amd64\\lib.exe\""
-
-# ...but use the native amd64 compiler if it is available.
-exists($$(VCINSTALLDIR)\\bin\\amd64) {
- QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\amd64\\cl.exe\""
- QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\amd64\\cl.exe\""
- QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\amd64\\link.exe\""
- QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\amd64\\lib.exe\""
-}
-
-QMAKE_RC = \""$$(WindowsSdkDir)\\bin\\x64\\rc.exe\""
-
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\atlmfc\\include"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\shared"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\um"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt"
-INCLUDEPATH *= "$$(DXSDK_DIR)\\include"
-
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\\amd64\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\\amd64\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\winv6.3\\um\\x64\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\\lib\\x64\""
diff --git a/qmake/toolchain/win32-msvc2013/x86-xp.toolchain b/qmake/toolchain/win32-msvc2013/x86-xp.toolchain deleted file mode 100644 index b3374c2fd..000000000 --- a/qmake/toolchain/win32-msvc2013/x86-xp.toolchain +++ /dev/null @@ -1,36 +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>.
-
-# This file describes the x86-xp toolchain of
-# MSVC2013 compiler. This is a special toolchain
-# that is designed to be backwards compatible
-# with Windows XP.
-#
-# This file can be included in a .pro file
-# to cause the target in that file to be
-# built for the x86 architecture targetting
-# Windows XP, regardless of the native
-# architecture of the build environment.
-
-WIN7_XP_SDK_DIR="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.1A"
-
-QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\cl.exe\" /D_USING_V110_SDK71_"
-QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\cl.exe\" /D_USING_V110_SDK71_"
-QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\lib.exe\""
-QMAKE_RC = \""$${WIN7_XP_SDK_DIR}\\bin\\rc.exe\" /D_USING_V110_SDK71_"
-
-INCLUDEPATH *= "$$(DXSDK_DIR)\\include"
-INCLUDEPATH *= "$${WIN7_XP_SDK_DIR}\\include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\atlmfc\\include"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\shared"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\um"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt"
-
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\\lib\\x86\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\winv6.3\\um\\x86\""
diff --git a/qmake/toolchain/win32-msvc2013/x86.toolchain b/qmake/toolchain/win32-msvc2013/x86.toolchain deleted file mode 100644 index 9363cbb17..000000000 --- a/qmake/toolchain/win32-msvc2013/x86.toolchain +++ /dev/null @@ -1,31 +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>.
-
-# This file describes the x86 toolchain of
-# MSVC2013 compiler.
-#
-# This file can be included in a .pro file
-# to cause the target in that file to be
-# built for the x86 architecture, regardless
-# of the native architecture of the build
-# environment.
-
-QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\cl.exe\""
-QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\cl.exe\""
-QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\lib.exe\""
-QMAKE_RC = \""$$(WindowsSdkDir)\\bin\\x86\\rc.exe\""
-
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\atlmfc\\include"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\shared"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\um"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt"
-INCLUDEPATH *= "$$(DXSDK_DIR)\\include"
-
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\winv6.3\\um\\x86\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\\lib\\x86\""
diff --git a/qmake/toolchain/win32-msvc2015/x64.toolchain b/qmake/toolchain/win32-msvc2015/x64.toolchain deleted file mode 100644 index 1a053a2d1..000000000 --- a/qmake/toolchain/win32-msvc2015/x64.toolchain +++ /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>.
-
-# This file describes the x64 toolchain of
-# MSVC2015 compiler.
-#
-# This file can be included in a .pro file
-# to cause the target in that file to be
-# built for the x64 architecture, regardless
-# of the native architecture of the build
-# environment.
-
-# Use the x86-based amd64 cross compiler by default...
-QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\x86_amd64\\cl.exe\""
-QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\x86_amd64\\cl.exe\""
-QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\x86_amd64\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\x86_amd64\\lib.exe\""
-
-# ... but use the native amd64 compiler if it is available.
-exists($$(VCINSTALLDIR)\\bin\\amd64) {
- QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\amd64\\cl.exe\""
- QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\amd64\\cl.exe\""
- QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\amd64\\link.exe\""
- QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\amd64\\lib.exe\""
-}
-
-QMAKE_RC = \""$$(WindowsSdkDir)bin\\$$(WindowsSDKLibVersion)x64\\rc.exe\""
-
-INCLUDEPATH *= "$$(VCINSTALLDIR)include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)atlmfc\\include"
-INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)shared"
-INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)um"
-INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)winrt"
-
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)lib\\amd64\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)atlmfc\\lib\\amd64\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)um\\x64\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)ucrt\\x64\""
diff --git a/qmake/toolchain/win32-msvc2015/x86-xp.toolchain b/qmake/toolchain/win32-msvc2015/x86-xp.toolchain deleted file mode 100644 index d200a7fde..000000000 --- a/qmake/toolchain/win32-msvc2015/x86-xp.toolchain +++ /dev/null @@ -1,37 +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>.
-
-# This file describes the x86-xp toolchain of
-# MSVC2015 compiler. This is a special toolchain
-# that is designed to be backwards compatible
-# with Windows XP.
-#
-# This file can be included in a .pro file
-# to cause the target in that file to be
-# built for the x86 architecture targetting
-# Windows XP, regardless of the native
-# architecture of the build environment.
-
-WIN7_XP_SDK_DIR="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.1A\\"
-
-QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\cl.exe\" /D_USING_V110_SDK71_"
-QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\cl.exe\" /D_USING_V110_SDK71_"
-QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\lib.exe\""
-QMAKE_RC = \""$${WIN7_XP_SDK_DIR}bin\\rc.exe\" /D_USING_V110_SDK71_"
-
-INCLUDEPATH *= "$$(DXSDK_DIR)include"
-INCLUDEPATH *= "$${WIN7_XP_SDK_DIR}include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)atlmfc\\include"
-INCLUDEPATH *= "$$(WindowsSdkDir)include\\$$(WindowsSDKLibVersion)shared"
-INCLUDEPATH *= "$$(WindowsSdkDir)include\\$$(WindowsSDKLibVersion)um"
-INCLUDEPATH *= "$$(WindowsSdkDir)include\\$$(WindowsSDKLibVersion)winrt"
-
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\\lib\\x86\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)atlmfc\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)um\\x86\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)ucrt\\x86\""
diff --git a/qmake/toolchain/win32-msvc2015/x86.toolchain b/qmake/toolchain/win32-msvc2015/x86.toolchain deleted file mode 100644 index 9dd1b250b..000000000 --- a/qmake/toolchain/win32-msvc2015/x86.toolchain +++ /dev/null @@ -1,30 +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>.
-
-# This file describes the x86 toolchain of
-# MSVC2015 compiler.
-#
-# This file can be included in a .pro file
-# to cause the target in that file to be
-# built for the x86 architecture, regardless
-# of the native architecture of the build
-# environment.
-
-QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\cl.exe\""
-QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\cl.exe\""
-QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\lib.exe\""
-QMAKE_RC = \""$$(WindowsSdkDir)bin\\$$(WindowsSDKLibVersion)x86\\rc.exe\""
-
-INCLUDEPATH *= "$$(VCINSTALLDIR)include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)atlmfc\\include"
-INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)shared"
-INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)um"
-INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)winrt"
-
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)atlmfc\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)um\\x86\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)ucrt\\x86\""
diff --git a/qmake/uname.pri b/qmake/uname.pri deleted file mode 100644 index 4af08d6bb..000000000 --- a/qmake/uname.pri +++ /dev/null @@ -1,10 +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>. - -UNAME= - -unix { - UNAME=$$system(uname -s) -} diff --git a/qmake/winpaths_default.pri b/qmake/winpaths_default.pri deleted file mode 100644 index 0617a2084..000000000 --- a/qmake/winpaths_default.pri +++ /dev/null @@ -1,36 +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>. - -# winpaths_default.pri -# -# This file contains the default paths for Windows dependencies. -# If you want to customize them do NOT CHANGE THIS FILE but instead -# create a winpaths_custom.pri file in this directory and overwrite -# the variables you need to customize. Do NOT COMMIT your custom file -# to the repository. -# - -ICE_PATH = %PROGPATH%/ZeroC/Ice-3.4.1 -BZIP2_PATH = /dev/bzip2 -PROTOBUF_PATH = /dev/protobuf-2.4.1 -OPENSSL_PATH = /dev/OpenSSL -LIBSNDFILE_PATH = %PROGPATH%/Mega-Nerd/libsndfile -BOOST_PATH = /dev/Boost -VLD_PATH = %PROGPATH%/Visual Leak Detector -BONJOUR_PATH = %PROGRAMFILES%/Bonjour SDK -ASIO_PATH = /dev/asio -G15SDK_PATH = /dev/G15SDK/LCDSDK - -# If we're building in win32-static, include -# winpaths_static.pri to override the defaults -# above. -CONFIG(static) { - include(winpaths_static.pri) -} - -# Include custom file if it exists -exists(winpaths_custom.pri) { - include(winpaths_custom.pri) -} diff --git a/qmake/winpaths_static.pri b/qmake/winpaths_static.pri deleted file mode 100644 index c4487bce1..000000000 --- a/qmake/winpaths_static.pri +++ /dev/null @@ -1,29 +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>. - -# winpaths_static.pri -# -# This file contains the default paths for Windows dependencies -# when running in the win32-static build environment from the -# mumble-releng repo. -# -# This file is included by winpaths_default.pri if the 'static' -# config option is passed to qmake. -# -# If you want to customize them do NOT CHANGE THIS FILE but instead -# create a winpaths_custom.pri file in this directory and overwrite -# the variables you need to customize. Do NOT COMMIT your custom file -# to the repository. -# - -ICE_PATH = $$(MUMBLE_PREFIX)/ZeroC-Ice -BZIP2_PATH = $$(MUMBLE_PREFIX)/bzip2 -PROTOBUF_PATH = $$(MUMBLE_PREFIX)/protobuf -OPENSSL_PATH = $$(MUMBLE_PREFIX)/OpenSSL -LIBSNDFILE_PATH = $$(MUMBLE_PREFIX)/sndfile -BOOST_PATH = $$(MUMBLE_PREFIX)/Boost -BONJOUR_PATH = $$(MUMBLE_PREFIX)/bonjour -ASIO_PATH = $$(MUMBLE_PREFIX)/asio -G15SDK_PATH = $$(MUMBLE_PREFIX)/G15SDK/LCDSDK diff --git a/scripts/development/IconSync.pro b/scripts/development/IconSync.pro deleted file mode 100644 index bdda7ec48..000000000 --- a/scripts/development/IconSync.pro +++ /dev/null @@ -1,9 +0,0 @@ -include(../../qmake/compiler.pri) - -TEMPLATE = app -CONFIG += qt thread warn_on debug console -CONFIG -= app_bundle -QT += network gui svg -LANGUAGE = C++ -TARGET = IconSync -SOURCES = IconSync.cpp diff --git a/scripts/mumble-version.py b/scripts/mumble-version.py index 90e94d268..0a7642194 100755 --- a/scripts/mumble-version.py +++ b/scripts/mumble-version.py @@ -75,23 +75,23 @@ def cmd(args): raise Exception('cmd: {0} failed with status {1}: {2}'.format(args, p.returncode, stderr)) return stdout.decode('utf-8') -# Reads the version from src/mumble.pri -def readMumblePriVersion(): +# Reads the version from CMakeLists.txt +def readMumbleVersion(): sourceTreeRoot = strip(cmd(['git', 'rev-parse', '--show-toplevel'])) version = None - with open(os.path.join(sourceTreeRoot, 'src', 'mumble.pri'), 'r') as f: + with open(os.path.join(sourceTreeRoot, 'CMakeLists.txt'), 'r') as f: for line in f: - if 'VERSION' in line: - line = line.replace('VERSION', '') - line = line.replace('=', '') - line = line.replace('\t', '') - line = line.replace(' ', '') - line = strip(line) + # The version is specified as e.g. set(version "1.4.0" CACHE STRING "Project version") + if 'set(version' in line: + line = line.replace('set(version', '') + line = line[0 : line.find('CACHE')].strip() + # remove quotes + line = line[1 : len(line) - 1] version = line break if version is None: - raise Exception('unable to read version from mumble.pri') + raise Exception('unable to read version from CMakeLists.txt') return version def main(): @@ -114,8 +114,8 @@ def main(): # Get the hash of the most recent commit (shortened) latestCommitHash = cmd(['git', 'rev-parse', '--short' , 'HEAD']).strip() - # Get the Mumble version that is set in the mumble.pri file - mumblePriVersion = readMumblePriVersion() + # Get the Mumble version that is set in the CMakeLists.txt file + mumblePriVersion = readMumbleVersion() if len(mumblePriVersion) == 0 or not '.' in mumblePriVersion: raise Exception('bad mumblePriVersion: "{0}"'.format(mumblePriVersion)) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff3245956..30cba33f8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,7 +72,7 @@ set(SHARED_SOURCES "crypto/CryptographicRandom.cpp" "crypto/CryptStateOCB2.cpp" - "${3RDPARTY_DIR}/arc4random-src/arc4random_uniform.cpp" + "${3RDPARTY_DIR}/arc4random/arc4random_uniform.cpp" ) set(SHARED_HEADERS @@ -108,7 +108,7 @@ set(SHARED_HEADERS "crypto/CryptState.h" "crypto/CryptStateOCB2.h" - "${3RDPARTY_DIR}/arc4random-src/arc4random_uniform.h" + "${3RDPARTY_DIR}/arc4random/arc4random_uniform.h" ) target_sources(shared @@ -134,7 +134,7 @@ target_include_directories(shared ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} PRIVATE - "${3RDPARTY_DIR}/arc4random-src" + "${3RDPARTY_DIR}/arc4random" ) target_link_libraries(shared diff --git a/src/mumble.pri b/src/mumble.pri deleted file mode 100644 index 4dd03aad9..000000000 --- a/src/mumble.pri +++ /dev/null @@ -1,131 +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) -include(../qmake/qt.pri) -include(../qmake/rcc.pri) -include(../qmake/pkgconfig.pri) - -VERSION = 1.4.0 -DIST = mumble.pri Message.h PacketDataStream.h crypto/CryptState.h crypto/CryptStateOCB2.h Timer.h Version.h OSInfo.h SSL.h -CONFIG += qt thread debug_and_release warn_on -DEFINES *= MUMBLE_VERSION_STRING=$$VERSION -INCLUDEPATH += $$PWD . ../mumble_proto -VPATH += $$PWD - -HEADERS *= \ - ACL.h \ - Channel.h \ - ChannelListener.h \ - crypto/CryptState.h \ - crypto/CryptStateOCB2.h \ - Connection.h \ - Group.h \ - HTMLFilter.h \ - User.h \ - Net.h \ - OSInfo.h \ - Timer.h \ - SSL.h \ - Version.h \ - SSLCipherInfo.h \ - SSLCipherInfoTable.h \ - licenses.h \ - License.h \ - LogEmitter.h \ - crypto/CryptographicHash.h \ - crypto/CryptographicRandom.h \ - PasswordGenerator.h \ - ByteSwap.h \ - HostAddress.cpp \ - Ban.h \ - EnvUtils.h \ - UnresolvedServerAddress.h \ - ServerAddress.h \ - ServerResolver.h \ - ServerResolverRecord.h \ - SelfSignedCertificate.h \ - SSLLocks.h \ - FFDHETable.h \ - FFDHE.h \ - SpeechFlags.h - -SOURCES *= \ - ACL.cpp \ - Group.cpp \ - Channel.cpp \ - ChannelListener.cpp \ - Connection.cpp \ - HTMLFilter.cpp \ - User.cpp \ - Timer.cpp \ - crypto/CryptStateOCB2.cpp \ - OSInfo.cpp \ - SSL.cpp \ - Version.cpp \ - SSLCipherInfo.cpp \ - License.cpp \ - LogEmitter.cpp \ - crypto/CryptographicHash.cpp \ - crypto/CryptographicRandom.cpp \ - PasswordGenerator.cpp \ - HostAddress.cpp \ - Ban.cpp \ - EnvUtils.cpp \ - UnresolvedServerAddress.cpp \ - ServerAddress.cpp \ - ServerResolver.cpp \ - ServerResolverRecord.cpp \ - SelfSignedCertificate.cpp \ - SSLLocks.cpp \ - FFDHE.cpp - -LIBS *= -lmumble_proto - -# Add arc4random_uniform -INCLUDEPATH *= ../../3rdparty/arc4random-src -SOURCES *= ../../3rdparty/arc4random-src/arc4random_uniform.cpp - -# Note: Protobuf generates into its own directory so we can mark it as a -# system include folder for unix. Otherwise the generated code creates -# a lot of spurious warnings in ours. - -CONFIG(packaged) { - MUMDEFVER = $$find(DEFINES, "MUMBLE_VERSION=") - count(MUMDEFVER, 0) { - DEFINES *= MUMBLE_VERSION=$$VERSION - } -} - -# Add OpenSSL dependency -include(../qmake/openssl.pri) - -# Add protobuf dependency -include(../qmake/protobuf.pri) - -win32-msvc* { - LIBS *= -lcrypt32 -lws2_32 - LIBS *= -ldelayimp -lQwave -delayload:Qwave.DLL -} - -win32-g++ { - LIBS *= -lprotobuf -lcrypt32 -lws2_32 - LIBS *= -ldelayimp -lqwave -delayload:qwave.dll -} - -unix { - CONFIG(static) { - PKG_CONFIG += --static - } - - QMAKE_CFLAGS *= "-I../mumble_proto" "-isystem ../mumble_proto" - QMAKE_CXXFLAGS *= "-I../mumble_proto" "-isystem ../mumble_proto" -} - -CONFIG(debug, debug|release) { - CONFIG += console -} - -QMAKE_LIBDIR = $$DESTDIR $$QMAKE_LIBDIR diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt index 7d9b1dba6..c0eaf813f 100644 --- a/src/mumble/CMakeLists.txt +++ b/src/mumble/CMakeLists.txt @@ -236,7 +236,7 @@ set(MUMBLE_SOURCES "${SHARED_SOURCE_DIR}/Group.h" "${SHARED_SOURCE_DIR}/SignalCurry.h" - "${3RDPARTY_DIR}/smallft-src/smallft.cpp" + "${3RDPARTY_DIR}/smallft/smallft.cpp" "mumble.qrc" "flags/mumble_flags_0.qrc" @@ -314,7 +314,7 @@ target_include_directories(mumble ${CMAKE_CURRENT_SOURCE_DIR} # This is required for includes in current folder to be found by files from the shared directory. "widgets" ${SHARED_SOURCE_DIR} - "${3RDPARTY_DIR}/smallft-src" + "${3RDPARTY_DIR}/smallft" ) find_pkg("LibSndFile;sndfile" REQUIRED) @@ -486,14 +486,14 @@ if(bundled-opus) option(OPUS_STACK_PROTECTOR "" OFF) endif() - add_subdirectory("${3RDPARTY_DIR}/opus-src" "${CMAKE_CURRENT_BINARY_DIR}/opus") + add_subdirectory("${3RDPARTY_DIR}/opus" "${CMAKE_CURRENT_BINARY_DIR}/opus") # Disable all warnings that the Opus code may emit - disable_warnings_for_all_targets_in("${3RDPARTY_DIR}/opus-src") + disable_warnings_for_all_targets_in("${3RDPARTY_DIR}/opus") add_dependencies(mumble opus) - target_include_directories(mumble PRIVATE "${3RDPARTY_DIR}/opus-src/include") + target_include_directories(mumble PRIVATE "${3RDPARTY_DIR}/opus/include") if(BUILD_TESTING) set_target_properties(test_opus_decode test_opus_padding PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests") @@ -812,15 +812,15 @@ if(bonjour) "BonjourClient.cpp" "BonjourClient.h" - "${3RDPARTY_DIR}/qqbonjour-src/BonjourRecord.h" - "${3RDPARTY_DIR}/qqbonjour-src/BonjourServiceBrowser.cpp" - "${3RDPARTY_DIR}/qqbonjour-src/BonjourServiceBrowser.h" - "${3RDPARTY_DIR}/qqbonjour-src/BonjourServiceResolver.cpp" - "${3RDPARTY_DIR}/qqbonjour-src/BonjourServiceResolver.h" + "${3RDPARTY_DIR}/qqbonjour/BonjourRecord.h" + "${3RDPARTY_DIR}/qqbonjour/BonjourServiceBrowser.cpp" + "${3RDPARTY_DIR}/qqbonjour/BonjourServiceBrowser.h" + "${3RDPARTY_DIR}/qqbonjour/BonjourServiceResolver.cpp" + "${3RDPARTY_DIR}/qqbonjour/BonjourServiceResolver.h" ) target_compile_definitions(mumble PRIVATE "USE_BONJOUR") - target_include_directories(mumble PRIVATE "${3RDPARTY_DIR}/qqbonjour-src") + target_include_directories(mumble PRIVATE "${3RDPARTY_DIR}/qqbonjour") endif() if(alsa) @@ -881,7 +881,7 @@ if(jackaudio) ) target_compile_definitions(mumble PRIVATE "USE_JACKAUDIO") - target_include_directories(mumble PRIVATE SYSTEM "${3RDPARTY_DIR}/jack-src") + target_include_directories(mumble PRIVATE SYSTEM "${3RDPARTY_DIR}/jack") endif() if(oss) @@ -903,7 +903,7 @@ if(portaudio) ) target_compile_definitions(mumble PRIVATE "USE_PORTAUDIO") - target_include_directories(mumble PRIVATE SYSTEM "${3RDPARTY_DIR}/portaudio-src") + target_include_directories(mumble PRIVATE SYSTEM "${3RDPARTY_DIR}/portaudio") endif() if(pulseaudio) diff --git a/src/mumble/flags/mumble_flags.pri b/src/mumble/flags/mumble_flags.pri deleted file mode 100644 index 83718f142..000000000 --- a/src/mumble/flags/mumble_flags.pri +++ /dev/null @@ -1 +0,0 @@ -RESOURCES *= flags/mumble_flags_0.qrc diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro deleted file mode 100644 index ba657d5dd..000000000 --- a/src/mumble/mumble.pro +++ /dev/null @@ -1,805 +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(../mumble.pri) -include(../../qmake/python.pri) -include(../../qmake/lrelease.pri) - -DEFINES *= MUMBLE -TEMPLATE = app -TARGET = mumble - -!CONFIG(qt4-legacy-compat) { - CONFIG += no-qt4-legacy-compat -} - -CONFIG(no-qt4-legacy-compat):isEqual(QT_MAJOR_VERSION, 4) { - error("$$escape_expand(\\n)$$escape_expand(\\n)"\ - "Mumble client support for Qt 4 is deprecated and will be dropped$$escape_expand(\\n)"\ - "completely in the future. We highly recommend switching to$$escape_expand(\\n)"\ - "building Mumble with Qt 5. For now CONFIG+=qt4-legacy-compat$$escape_expand(\\n)"\ - "can be used to build with Qt 4. Note that if built this way,$$escape_expand(\\n)"\ - "Mumble might lack certain bug-fixes and capabilities available$$escape_expand(\\n)"\ - "when built with Qt 5.$$escape_expand(\\n)"\ - "$$escape_expand(\\n)") -} - -isEqual(QT_MAJOR_VERSION, 4) { - warning("$$escape_expand(\\n)$$escape_expand(\\n)"\ - "Mumble client support for Qt 4 is deprecated and will be dropped$$escape_expand(\\n)"\ - "completely in the future. We highly recommend switching to$$escape_expand(\\n)"\ - "building Mumble with Qt 5. When built with Qt 4, Mumble might$$escape_expand(\\n)"\ - "lack certain bug-fixes and capabilities available when built$$escape_expand(\\n)"\ - "with Qt 5 already.$$escape_expand(\\n)"\ - "$$escape_expand(\\n)") -} - -CONFIG(static) { - # On Windows, building a static client - # means building the main app into a DLL. - win32 { - TEMPLATE = lib - TARGET = mumble_app - VERSION = - - CONFIG -= static - CONFIG += shared qt_static mumble_dll - DEFINES += USE_MUMBLE_DLL - isEqual(QT_MAJOR_VERSION, 5) { - # Qt 5 uses an auto-generated .cpp file for importing plugins. - # However, it is only automatically enabled for TEMPLATE = app. - # Since we're building mumble_app.dll, we're not an app, but a library. - # This means we'll have to explicitly ask Qt to generate and build the - # plugin importer. - CONFIG += force_import_plugins - } - } - - DEFINES *= USE_STATIC - CONFIG += static_qt_plugins -} - -QT *= network sql xml svg concurrent -isEqual(QT_MAJOR_VERSION, 5) { - QT *= widgets - - CONFIG(qtspeech) { - qtHaveModule(texttospeech) { - QT *= texttospeech - } else { - error("You enabled the 'qtspeech' CONFIG option, but the required 'texttospeech' module is not available on your system!") - } - } -} - -HEADERS *= BanEditor.h \ - ACLEditor.h \ - ConfigWidget.h \ - Log.h \ - AudioConfigDialog.h \ - AudioStats.h \ - AudioInput.h \ - AudioOutput.h \ - AudioOutputSample.h \ - AudioOutputSpeech.h \ - AudioOutputUser.h \ - CELTCodec.h \ - CustomElements.h \ - MainWindow.h \ - ServerHandler.h \ - About.h \ - ConnectDialog.h \ - GlobalShortcut.h \ - TextToSpeech.h \ - Settings.h \ - Database.h \ - VersionCheck.h \ - Global.h \ - UserModel.h \ - Audio.h \ - ConfigDialog.h \ - Plugins.h \ - PTTButtonWidget.h \ - LookConfig.h \ - SharedMemory.h \ - AudioWizard.h \ - ViewCert.h \ - TextMessage.h \ - NetworkConfig.h \ - LCD.h \ - Usage.h \ - Cert.h \ - ClientUser.h \ - UserEdit.h \ - UserListModel.h \ - UserLocalVolumeDialog.h \ - ListenerLocalVolumeDialog.h \ - Tokens.h \ - UserView.h \ - RichTextEditor.h \ - UserInformation.h \ - SocketRPC.h \ - VoiceRecorder.h \ - VoiceRecorderDialog.h \ - WebFetch.h \ - ../SignalCurry.h \ - MumbleApplication.h \ - ApplicationPalette.h \ - ThemeInfo.h \ - Themes.h \ - widgets/MUComboBox.h \ - DeveloperConsole.h \ - XMLTools.h \ - Screen.h \ - SvgIcon.h \ - Markdown.h \ - TalkingUI.h \ - TalkingUISelection.h - -SOURCES *= BanEditor.cpp \ - ACLEditor.cpp \ - ConfigWidget.cpp \ - Log.cpp \ - AudioConfigDialog.cpp \ - AudioStats.cpp \ - AudioInput.cpp \ - AudioOutput.cpp \ - AudioOutputSample.cpp \ - AudioOutputSpeech.cpp \ - AudioOutputUser.cpp \ - main.cpp \ - CELTCodec.cpp \ - CustomElements.cpp \ - MainWindow.cpp \ - ServerHandler.cpp \ - About.cpp \ - ConnectDialog.cpp \ - Settings.cpp \ - Database.cpp \ - VersionCheck.cpp \ - Global.cpp \ - UserModel.cpp \ - Audio.cpp \ - ConfigDialog.cpp \ - Plugins.cpp \ - PTTButtonWidget.cpp \ - LookConfig.cpp \ - SharedMemory.cpp \ - AudioWizard.cpp \ - ViewCert.cpp \ - Messages.cpp \ - TextMessage.cpp \ - GlobalShortcut.cpp \ - NetworkConfig.cpp \ - LCD.cpp \ - Usage.cpp \ - Cert.cpp \ - ClientUser.cpp \ - UserEdit.cpp \ - UserListModel.cpp \ - UserLocalVolumeDialog.cpp \ - ListenerLocalVolumeDialog.cpp \ - Tokens.cpp \ - UserView.cpp \ - RichTextEditor.cpp \ - UserInformation.cpp \ - SocketRPC.cpp \ - VoiceRecorder.cpp \ - VoiceRecorderDialog.cpp \ - WebFetch.cpp \ - MumbleApplication.cpp \ - ../../3rdparty/smallft-src/smallft.cpp \ - ThemeInfo.cpp \ - Themes.cpp \ - widgets/MUComboBox.cpp \ - DeveloperConsole.cpp \ - XMLTools.cpp \ - Screen.cpp \ - SvgIcon.cpp \ - Markdown.cpp \ - TalkingUI.cpp \ - TalkingUISelection.cpp - -!CONFIG(no-overlay) { - DEFINES *= USE_OVERLAY - - HEADERS *= Overlay.h \ - OverlayClient.h \ - OverlayText.h \ - OverlayUser.h \ - OverlayUserGroup.h \ - OverlayConfig.h \ - OverlayEditor.h \ - OverlayEditorScene.h \ - PathListWidget.h \ - OverlayPositionableItem.h - - SOURCES *= Overlay.cpp \ - OverlayClient.cpp \ - OverlayText.cpp \ - OverlayUser.cpp \ - OverlayUserGroup.cpp \ - OverlayConfig.cpp \ - OverlayEditor.cpp \ - OverlayEditorScene.cpp \ - PathListWidget.cpp \ - OverlayPositionableItem.cpp - - FORMS *= Overlay.ui \ - OverlayEditor.ui -} - - -CONFIG(qtspeech) { - SOURCES *= TextToSpeech.cpp -} - -RESOURCES *= mumble.qrc mumble_translations.qrc ../../themes/MumbleTheme.qrc - -!CONFIG(no-classic-theme) { - RESOURCES *= ../../themes/ClassicTheme.qrc -} - -# Add the various mumble_flags_XX.qrc files to RESOURCES... -include(flags/mumble_flags.pri) - -FORMS *= ConfigDialog.ui \ - MainWindow.ui \ - ConnectDialog.ui \ - ConnectDialogEdit.ui \ - BanEditor.ui \ - ACLEditor.ui \ - Plugins.ui \ - PTTButtonWidget.ui \ - LookConfig.ui \ - AudioInput.ui \ - AudioOutput.ui \ - Log.ui \ - TextMessage.ui \ - AudioStats.ui \ - NetworkConfig.ui \ - LCD.ui \ - GlobalShortcut.ui \ - GlobalShortcutTarget.ui \ - Cert.ui \ - UserEdit.ui \ - UserLocalVolumeDialog.ui \ - AudioWizard.ui \ - Tokens.ui \ - RichTextEditor.ui \ - RichTextEditorLink.ui \ - UserInformation.ui \ - VoiceRecorderDialog.ui - -# Include TRANSLATIONS variable -include(translations.pri) - -PRECOMPILED_HEADER = mumble_pch.hpp -INCLUDEPATH *= ../../3rdparty/qqbonjour-src -INCLUDEPATH *= ../../3rdparty/smallft-src -INCLUDEPATH *= widgets - -CONFIG(static) { - # Ensure that static Mumble.app on Mac OS X - # includes and exports its Qt symbols to plugins. - # - # Some plugins (libmanual) already make use of Qt - # functionality, and it's not inconceivable that some - # Mumble features will be split into plugins in the - # future. - macx { - QMAKE_LFLAGS -= -Wl,-dead_strip - QMAKE_LFLAGS += -Wl,-all_load - } -} - -!CONFIG(no-manual-plugin) { - SOURCES *= ManualPlugin.cpp - HEADERS *= ManualPlugin.h - FORMS *= ManualPlugin.ui - DEFINES *= USE_MANUAL_PLUGIN -} - -unix:!CONFIG(bundled-speex):system($$PKG_CONFIG --atleast-version=1.2 speexdsp):system($$PKG_CONFIG --atleast-version=1.2 speex) { - CONFIG *= no-bundled-speex -} - -CONFIG(no-crash-report) { - DEFINES *= NO_CRASH_REPORT -} else:unix:!macx { - DEFINES *= NO_CRASH_REPORT -} else { - HEADERS *= CrashReporter.h - SOURCES *= CrashReporter.cpp -} - -CONFIG(no-xinput2) { - DEFINES *= NO_XINPUT2 -} - -CONFIG(no-bundled-speex) { - must_pkgconfig(speex) - must_pkgconfig(speexdsp) -} - -!CONFIG(no-bundled-speex) { - INCLUDEPATH *= ../../3rdparty/speex-src/include ../../3rdparty/speex-src/libspeex ../../3rdparty/speex-build ../../3rdparty/speexdsp-src/include ../../3rdparty/speexdsp-src/libspeexdsp - LIBS *= -lspeex -} - -CONFIG(sbcelt) { - SOURCES -= CELTCodec.cpp - SOURCES += CELTCodec_sbcelt.cpp - INCLUDEPATH *= ../../3rdparty/celt-0.7.0-src/libcelt ../../3rdparty/sbcelt-src - LIBS *= -lcelt -lsbcelt - DEFINES *= SBCELT_PREFIX_API SBCELT_COMPAT_API USE_SBCELT -} else { - unix:!CONFIG(bundled-celt):system($$PKG_CONFIG --atleast-version=0.7.0 celt) { - CONFIG *= no-bundled-celt - } - CONFIG(no-bundled-celt) { - INCLUDEPATH *= /usr/include/celt - unix { - QMAKE_CFLAGS *= "-I/usr/include/celt" "-isystem /usr/include/celt" - QMAKE_CXXFLAGS *= "-I/usr/include/celt" "-isystem /usr/include/celt" - } - } - !CONFIG(no-bundled-celt) { - INCLUDEPATH *= ../../3rdparty/celt-0.7.0-src/libcelt - unix { - QMAKE_CFLAGS *= "-I../../3rdparty/celt-0.7.0-src/libcelt" "-isystem ../../3rdparty/celt-0.7.0-src/libcelt" - QMAKE_CXXFLAGS *= "-I../../3rdparty/celt-0.7.0-src/libcelt" "-isystem ../../3rdparty/celt-0.7.0-src/libcelt" - } - } -} - -!win32:!macx:!CONFIG(no-dbus) { - CONFIG *= dbus -} -!contains(UNAME, FreeBSD):!CONFIG(no-g15) { - CONFIG *= g15 -} - -!CONFIG(no-bonjour) { - CONFIG *= bonjour -} - -CONFIG(no-vorbis-recording) { - DEFINES *= NO_VORBIS_RECORDING -} - -unix:!CONFIG(bundled-opus):system($$PKG_CONFIG --exists opus) { - must_pkgconfig(opus) - DEFINES *= USE_OPUS - HEADERS *= OpusCodec.h - SOURCES *= OpusCodec.cpp -} else { - !CONFIG(no-opus) { - CONFIG *= opus - } - - CONFIG(opus) { - INCLUDEPATH *= ../../3rdparty/opus-src/celt ../../3rdparty/opus-src/include ../../3rdparty/opus-src/src ../../3rdparty/opus-build/src - DEFINES *= USE_OPUS - HEADERS *= OpusCodec.h - SOURCES *= OpusCodec.cpp - unix { - QMAKE_CFLAGS *= "-I../../3rdparty/opus-src/celt" "-isystem ../../3rdparty/opus-src/celt" - QMAKE_CFLAGS *= "-I../../3rdparty/opus-src/include" "-isystem ../../3rdparty/opus-src/include" - QMAKE_CXXFLAGS *= "-I../../3rdparty/opus-src/celt" "-isystem ../../3rdparty/opus-src/celt" - QMAKE_CXXFLAGS *= "-I../../3rdparty/opus-src/include" "-isystem ../../3rdparty/opus-src/include" - } - } -} - -unix:!CONFIG(bundled-rnnoise):system($$PKG_CONFIG --exists rnnoise) { - must_pkgconfig(rnnoise) - DEFINES *= USE_RNNOISE -} else { - !CONFIG(no-rnnoise) { - CONFIG *= rnnoise - } - - CONFIG(rnnoise) { - INCLUDEPATH *= ../../3rdparty/rnnoise-src/include - DEFINES *= USE_RNNOISE - LIBS *= -lrnnoise - } -} - -win32 { - CONFIG(mumble_dll) { - RC_FILE = mumble_dll.rc - } else { - RC_FILE = mumble.rc - } - HEADERS *= GlobalShortcut_win.h TaskList.h UserLockFile.h - SOURCES *= GlobalShortcut_win.cpp SharedMemory_win.cpp Log_win.cpp os_win.cpp TaskList.cpp WinGUIDs.cpp ../../overlay/ods.cpp UserLockFile_win.cpp os_early_win.cpp - - !CONFIG(no-overlay) { - HEADERS *= Overlay_win.h - SOURCES *= Overlay_win.cpp - } - - !CONFIG(qtspeech) { - SOURCES *= TextToSpeech_win.cpp - } - - LIBS *= -ldxguid -ldinput8 -lsapi -lole32 -lws2_32 -ladvapi32 -lwintrust -ldbghelp -lshell32 -lshlwapi -luser32 -lgdi32 -lpsapi - win32-g++ { - LIBS *= -lsndfile -lvorbis -lvorbisfile -lvorbisenc -logg -lFLAC - } - win32-msvc* { - LIBS *= -lsndfile -lvorbis -lvorbisfile -logg -lFLAC - } - - # Boost - win32-msvc* { - LIBS *= -llibboost_system-mt -llibboost_thread-mt - } - win32-g++ { - LIBS *= -lboost_system-mt - - # The library has a different name in MXE - contains(QMAKE_HOST.os, Linux) { - LIBS *= -lboost_thread_win32-mt - } else { - LIBS *= -lboost_thread-mt - } - } - - LIBS *= -ldelayimp -delayload:shell32.dll - - DEFINES *= WIN32 - !CONFIG(no-asio) { - CONFIG *= asio - } - !CONFIG(no-wasapi) { - CONFIG *= wasapi - } - !CONFIG(no-gkey) { - CONFIG *= gkey - } - - CONFIG(gkey) { - HEADERS *= GKey.h - SOURCES *= GKey.cpp - DEFINES *= USE_GKEY - } - - !CONFIG(no-xboxinput) { - CONFIG *= xboxinput - } - CONFIG(xboxinput) { - HEADERS *= XboxInput.h - SOURCES *= XboxInput.cpp - DEFINES *= USE_XBOXINPUT - } - - # XInputCheck (3rdparty/xinputheck-src) - INCLUDEPATH *= ../../3rdparty/xinputcheck-src - LIBS *= -lxinputcheck - - !CONFIG(mumble_dll) { - !CONFIG(no-elevation) { - CONFIG(release, debug|release) { - QMAKE_LFLAGS *= /MANIFESTUAC:\"level=\'asInvoker\' uiAccess=\'true\'\" - } - } - win32-msvc* { - QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote(mt.exe -nologo -updateresource:$(DESTDIR_TARGET);1 -manifest mumble.appcompat.manifest) - } - } -} - -unix { - HAVE_PULSEAUDIO=$$system($$PKG_CONFIG --modversion --silence-errors libpulse) - HAVE_JACKAUDIO=$$system($$PKG_CONFIG --modversion --silence-errors jack) - - !isEmpty(HAVE_PULSEAUDIO):!CONFIG(no-pulseaudio) { - CONFIG *= pulseaudio - } - - !isEmpty(HAVE_JACKAUDIO):!CONFIG(no-jackaudio) { - CONFIG *= jackaudio - } - - - !CONFIG(no-bundled-speex) { - QMAKE_CFLAGS *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build - QMAKE_CXXFLAGS *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build - QMAKE_CXXFLAGS_RELEASE *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build - QMAKE_CXXFLAGS_DEBUG *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build - } - - CONFIG *= link_pkgconfig - - must_pkgconfig(sndfile) - - macx { - TARGET = Mumble - ICON = ../../icons/mumble.icns - QMAKE_INFO_PLIST = mumble.plist - QMAKE_PKGINFO_TYPEINFO = MBLE - - LIBS += -framework Security -framework SecurityInterface -framework ApplicationServices - - HEADERS *= GlobalShortcut_macx.h AppNap.h - SOURCES *= SharedMemory_unix.cpp - OBJECTIVE_SOURCES *= GlobalShortcut_macx.mm os_macx.mm Log_macx.mm AppNap.mm - - !CONFIG(qtspeech) { - OBJECTIVE_SOURCES *= TextToSpeech_macx.mm - } - - !CONFIG(universal) { - # Link against libxar so we can inspect Mac OS X installer packages. - CONFIG(static) { - LIBS += -lxml2 -lbz2 -lxar - } else { - LIBS += -lxar - } - - LIBS += -framework ScriptingBridge - !config(no-overlay) { - OBJECTIVE_SOURCES += Overlay_macx.mm - } - } else { - !CONFIG(no-overlay) { - SOURCES += Overlay_unix.cpp - } - } - - # CoreAudio - LIBS += -framework CoreAudio -framework AudioUnit -framework AudioToolbox - SOURCES += CoreAudio.cpp - HEADERS += CoreAudio.h - } else { - HEADERS *= GlobalShortcut_unix.h - SOURCES *= os_unix.cpp GlobalShortcut_unix.cpp SharedMemory_unix.cpp Log_unix.cpp - - !CONFIG(no-overlay) { - SOURCES *= Overlay_unix.cpp - } - - !CONFIG(qtspeech) { - SOURCES *= TextToSpeech_unix.cpp - } - - must_pkgconfig(x11) - linux* { - LIBS *= -lrt - } - LIBS *= -lXi - - !CONFIG(no-oss) { - CONFIG *= oss - } - - !CONFIG(no-alsa):contains(UNAME, Linux) { - CONFIG *= alsa - } - - !CONFIG(no-speechd) { - CONFIG *= speechd - } else { - DEFINES *= USE_NO_TTS - } - } -} - -alsa { - DEFINES *= USE_ALSA - must_pkgconfig(alsa) - HEADERS *= ALSAAudio.h - SOURCES *= ALSAAudio.cpp -} - -oss { - DEFINES *= USE_OSS - HEADERS *= OSS.h - SOURCES *= OSS.cpp - INCLUDEPATH *= /usr/lib/oss/include -} - -pulseaudio { - DEFINES *= USE_PULSEAUDIO - must_pkgconfig(libpulse) - HEADERS *= PulseAudio.h - SOURCES *= PulseAudio.cpp -} - -jackaudio { - DEFINES *= USE_JACKAUDIO - HEADERS *= JackAudio.h - SOURCES *= JackAudio.cpp - INCLUDEPATH *= ../../3rdparty/jack-src -} - -portaudio { - DEFINES *= USE_PORTAUDIO - HEADERS *= PAAudio.h - SOURCES *= PAAudio.cpp - INCLUDEPATH *= ../../3rdparty/portaudio-src -} - -asio { - DEFINES *= USE_ASIO - HEADERS *= ASIOInput.h - SOURCES *= ASIOInput.cpp - FORMS *= ASIOInput.ui - - # If 3rdparty/asio exists, use that... - exists(../../3rdparty/asio) { - INCLUDEPATH *= ../../3rdparty/asio/common ../../3rdparty/asio/host ../../3rdparty/asio/host/pc - # Otherwise, fall back to the path from winpaths_*.pri. - } else { - INCLUDEPATH *= "$$ASIO_PATH/common" "$$ASIO_PATH/host" "$$ASIO_PATH/host/pc" - } -} - -bonjour { - DEFINES *= USE_BONJOUR - - HEADERS *= \ - ../../3rdparty/qqbonjour-src/BonjourRecord.h \ - ../../3rdparty/qqbonjour-src/BonjourServiceResolver.h \ - ../../3rdparty/qqbonjour-src/BonjourServiceBrowser.h \ - BonjourClient.h - SOURCES *= \ - ../../3rdparty/qqbonjour-src/BonjourServiceResolver.cpp \ - ../../3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp \ - BonjourClient.cpp - win32 { - INCLUDEPATH *= "$$BONJOUR_PATH/include" - QMAKE_LIBDIR *= "$$BONJOUR_PATH/lib/win32" - LIBS *= -lDNSSD - } - unix:!macx { - system($$PKG_CONFIG --exists avahi-compat-libdns_sd avahi-client) { - must_pkgconfig(avahi-compat-libdns_sd) - must_pkgconfig(avahi-client) - } else { - LIBS *= -ldns_sd - } - } -} - -dbus { - DEFINES *= USE_DBUS - QT *= dbus - HEADERS *= DBus.h - SOURCES *= DBus.cpp -} - -speechd { - DEFINES *= USE_SPEECHD - system($$PKG_CONFIG --atleast-version=0.8 speech-dispatcher) { - DEFINES *= USE_SPEECHD_PKGCONFIG - must_pkgconfig(speech-dispatcher) - } else { - LIBS *= -lspeechd - INCLUDEPATH *= /usr/include/speech-dispatcher - } -} - -wasapi { - DEFINES *= USE_WASAPI - HEADERS *= WASAPI.h WASAPINotificationClient.h - SOURCES *= WASAPI.cpp WASAPINotificationClient.cpp - LIBS *= -lavrt -delayload:avrt.DLL - win32-g++ { - LIBS *= -lksuser - } -} - -g15 { - DEFINES *= USE_G15 - win32|macx { - SOURCES *= G15LCDEngine_helper.cpp - HEADERS *= G15LCDEngine_helper.h ../../g15helper/g15helper.h - } - unix:!macx:!contains(UNAME, FreeBSD) { - SOURCES *= G15LCDEngine_unix.cpp - HEADERS *= G15LCDEngine_unix.h - LIBS *= -lg15daemon_client - } -} - -CONFIG(no-update) { - DEFINES *= NO_UPDATE_CHECK -} - -!CONFIG(no-embed-qt-translations):!exists($$[QT_INSTALL_TRANSLATIONS]) { - error("$$escape_expand(\\n)$$escape_expand(\\n)"\ - "The QT_INSTALL_TRANSLATIONS directory ($$[QT_INSTALL_TRANSLATIONS])$$escape_expand(\\n)"\ - "does not exist.$$escape_expand(\\n)"\ - "$$escape_expand(\\n)"\ - "The Mumble build process is attempting to embed Qt translations into the Mumble binary,$$escape_expand(\\n)"\ - "but it cannot, because the files are missing.$$escape_expand(\\n)"\ - "$$escape_expand(\\n)"\ - "If you wish to embed Qt translations into the Mumble binary,$$escape_expand(\\n)"\ - "you will need to install the translation package for your verison of Qt.$$escape_expand(\\n)"\ - "For example, On Ubuntu with Qt 5, that package is 'qttranslations5-l10n'.$$escape_expand(\\n)"\ - "$$escape_expand(\\n)"\ - "You can also tell the Mumble build process to not embed Qt's$$escape_expand(\\n)"\ - "translations into the Mumble binary by using the 'no-embed-qt-translations'$$escape_expand(\\n)"\ - "CONFIG option when running qmake, such as:$$escape_expand(\\n)"\ - "$$escape_expand(\\n)"\ - " $ qmake -recursive main.pro CONFIG+=$$escape_expand(\")no-embed-qt-translations$$escape_expand(\")$$escape_expand(\\n)"\ - "$$escape_expand(\\n)"\ - "Please refer to the INSTALL file at the root of the source tree for more information$$escape_expand(\\n)"\ - "about the build process.$$escape_expand(\\n)"\ - "$$escape_expand(\\n)") -} - -!CONFIG(no-embed-qt-translations) { - QT_TRANSLATIONS_LOCAL_DIR = qttranslations - QT_TRANSLATIONS_LOCAL_FILES = $$files($$QT_TRANSLATIONS_LOCAL_DIR/*.ts) - for(fn, QT_TRANSLATIONS_LOCAL_FILES) { - !system($$QMAKE_LRELEASE -silent $$fn) { - error(Failed to run lrelease for $$fn) - } - } - GENQRC = $$PYTHON ../../scripts/generate-mumble_qt-qrc.py - !system($$GENQRC mumble_qt_auto.qrc $$[QT_INSTALL_TRANSLATIONS] $$QT_TRANSLATIONS_LOCAL_DIR) { - error(Failed to run generate-mumble_qt-qrc.py script) - } - RESOURCES *= mumble_qt_auto.qrc -} - -CONFIG(static_qt_plugins) { - DEFINES += USE_STATIC_QT_PLUGINS - - # If QSQLite is a plugin we need to import it in order to use the database - exists($$[QT_INSTALL_PLUGINS]/sqldrivers/*qsqlite*) { - QTPLUGIN += qsqlite - } - - # Since Qt 5.3, qt.prf will automatically populate QT_PLUGINS for static builds - # for TEMPLATE=app. - # - # On Windows, in CONFIG(static), we don't use TEMPLATE=app, so we still need this - # code there. But for macOS, we don't need it anymore. - !contains(TEMPLATE, .*app)|lessThan(QT_VERSION_INT, 50300) { - QTPLUGIN += qsvg qsvgicon - - # For Qt 4 and Qt 5 below 5.4, we need to manually add qtaccessiblewidgets to PLUGINS. - # In Qt 5.4, the plugin was integrated into the QtWidgets library. - # See QTBUG-43007 and Qt commit 4255ba40ab073a for more information. - lessThan(QT_VERSION_INT, 50400) { - QTPLUGIN *= qtaccessiblewidgets - } - - macx { - isEqual(QT_MAJOR_VERSION, 5) { - QTPLUGIN += qicns qcocoa - } else { - QTPLUGIN += qicnsicon - } - } - - win32 { - QTPLUGIN *= qico - isEqual(QT_MAJOR_VERSION, 5) { - QTPLUGIN += qwindows - } - } - } - - # Icon engines are special; they don't get their lib directory - # included automatically by mkspecs/features/qt.prf - LIBS *= -L$$[QT_INSTALL_PLUGINS]/iconengines -} - -lrel.output = ${QMAKE_FILE_BASE}.qm -lrel.commands = $${QMAKE_LRELEASE} ${QMAKE_FILE_NAME} -lrel.input = TRANSLATIONS -lrel.CONFIG *= no_link -lrel.variable_out = rcc.depends - -QMAKE_EXTRA_COMPILERS *= lrel - -include(../../qmake/symbols.pri) diff --git a/src/mumble/translations.pri b/src/mumble/translations.pri deleted file mode 100644 index 3654c25fe..000000000 --- a/src/mumble/translations.pri +++ /dev/null @@ -1,3 +0,0 @@ -# Do not change manually -# Autogenerated by mumble transifex bot -TRANSLATIONS = mumble_ar.ts mumble_be.ts mumble_bg.ts mumble_br.ts mumble_ca.ts mumble_ca_ES.ts mumble_cs.ts mumble_cy.ts mumble_da.ts mumble_de.ts mumble_el.ts mumble_en.ts mumble_en_GB.ts mumble_eo.ts mumble_es.ts mumble_eu.ts mumble_fa_IR.ts mumble_fi.ts mumble_fr.ts mumble_gl.ts mumble_he.ts mumble_hi.ts mumble_hu.ts mumble_it.ts mumble_ja.ts mumble_ko.ts mumble_lt.ts mumble_nl.ts mumble_no.ts mumble_oc.ts mumble_pl.ts mumble_pt_BR.ts mumble_pt_PT.ts mumble_ro.ts mumble_ru.ts mumble_sk.ts mumble_sv.ts mumble_te.ts mumble_th.ts mumble_tr.ts mumble_uk.ts mumble_vi.ts mumble_zh_CN.ts mumble_zh_HK.ts mumble_zh_TW.ts
\ No newline at end of file diff --git a/src/mumble_exe/mumble_exe.pro b/src/mumble_exe/mumble_exe.pro deleted file mode 100644 index dfbd73323..000000000 --- a/src/mumble_exe/mumble_exe.pro +++ /dev/null @@ -1,58 +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 -TARGET = mumble - -INCLUDEPATH *= $$PWD/.. - -win32 { - DEFINES += WIN32 _WIN32 - RC_FILE = ../mumble/mumble.rc - LIBS *= -luser32 -lshlwapi - - win32-g++ { - QMAKE_LFLAGS *= -municode - DEFINES *= _UNICODE - } - - win32-msvc* { - CONFIG(release, debug|release) { - QMAKE_CXXFLAGS_RELEASE -= -MD - QMAKE_CXXFLAGS += -MT - } - CONFIG(debug, debug|release) { - QMAKE_CXXFLAGS_DEBUG -= -MDd - QMAKE_CXXFLAGS += -MTd - } - } -} - -SOURCES *= mumble_exe.cpp Overlay.cpp - -!CONFIG(no-elevation) { - CONFIG(release, debug|release) { - QMAKE_LFLAGS *= /MANIFESTUAC:\"level=\'asInvoker\' uiAccess=\'true\'\" - } -} - -win32-msvc* { - QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote(mt.exe -nologo -updateresource:$(DESTDIR_TARGET);1 -manifest ../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/src/mumble_proto/mumble_proto.pro b/src/mumble_proto/mumble_proto.pro deleted file mode 100644 index 42f130502..000000000 --- a/src/mumble_proto/mumble_proto.pro +++ /dev/null @@ -1,41 +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) -include(../../qmake/protoc.pri) - -PROTOBUF *= ../Mumble.proto - -pbh.output = ${QMAKE_FILE_BASE}.pb.h -pbh.depends = ${QMAKE_FILE_BASE}.pb.cc -pbh.commands = $$escape_expand(\\n) -pbh.input = PROTOBUF -pbh.CONFIG *= no_link explicit_dependencies target_predeps -pbh.variable_out = HEADERS - -pb.output = ${QMAKE_FILE_BASE}.pb.cc -pb.commands = $${PROTOC} --cpp_out=. -I. -I.. -I${QMAKE_FILE_IN_PATH} ${QMAKE_FILE_NAME} -pb.input = PROTOBUF -pb.CONFIG *= no_link explicit_dependencies -pb.variable_out = SOURCES - -TEMPLATE = lib -CONFIG -= qt -CONFIG += debug_and_release -CONFIG += staticlib - -# Add protobuf dependency -include(../../qmake/protobuf.pri) - -QMAKE_EXTRA_COMPILERS *= pb pbh - -!CONFIG(third-party-warnings) { - # We ignore warnings in third party builds. We won't actually look - # at them and they clutter out our warnings. - CONFIG -= warn_on - CONFIG += warn_off -} - -include(../../qmake/symbols.pri) diff --git a/src/murmur/CMakeLists.txt b/src/murmur/CMakeLists.txt index 35d018d93..6cb8d7d54 100644 --- a/src/murmur/CMakeLists.txt +++ b/src/murmur/CMakeLists.txt @@ -158,16 +158,16 @@ if(bonjour) target_compile_definitions(murmur PRIVATE "USE_BONJOUR") - target_include_directories(murmur PRIVATE "${3RDPARTY_DIR}/qqbonjour-src") + target_include_directories(murmur PRIVATE "${3RDPARTY_DIR}/qqbonjour") target_sources(murmur PRIVATE "BonjourServer.cpp" "BonjourServer.h" - "${3RDPARTY_DIR}/qqbonjour-src/BonjourRecord.h" - "${3RDPARTY_DIR}/qqbonjour-src/BonjourServiceRegister.cpp" - "${3RDPARTY_DIR}/qqbonjour-src/BonjourServiceRegister.h" + "${3RDPARTY_DIR}/qqbonjour/BonjourRecord.h" + "${3RDPARTY_DIR}/qqbonjour/BonjourServiceRegister.cpp" + "${3RDPARTY_DIR}/qqbonjour/BonjourServiceRegister.h" ) endif() diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro deleted file mode 100644 index a772b7308..000000000 --- a/src/murmur/murmur.pro +++ /dev/null @@ -1,217 +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(../mumble.pri) -include(../../qmake/protoc.pri) - -DEFINES *= MURMUR -TEMPLATE =app -CONFIG *= network -CONFIG -= gui -QT *= network sql xml -QT -= gui -TARGET = murmur -DBFILE = murmur.db -LANGUAGE = C++ -FORMS = -HEADERS *= Server.h ServerDB.h ServerUser.h Meta.h PBKDF2.h -SOURCES *= main.cpp Server.cpp ServerUser.cpp ServerDB.cpp Register.cpp Cert.cpp Messages.cpp Meta.cpp RPC.cpp PBKDF2.cpp - -PRECOMPILED_HEADER = murmur_pch.h - -!CONFIG(no-ice) { - CONFIG *= ice -} - -!CONFIG(no-dbus):!win32:!macx { - CONFIG *= dbus -} - -!CONFIG(no-bonjour) { - CONFIG *= bonjour -} - -win32 { - RC_FILE = murmur.rc - CONFIG *= gui - QT *= gui - isEqual(QT_MAJOR_VERSION, 5) { - QT *= widgets - } - RESOURCES *= murmur.qrc - SOURCES *= Tray.cpp About.cpp - HEADERS *= Tray.h About.h - LIBS *= -luser32 -ladvapi32 - win32-msvc* { - QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote(mt.exe -nologo -updateresource:$(DESTDIR_TARGET);1 -manifest ../mumble/mumble.appcompat.manifest) - } -} - -unix { - contains(UNAME, Linux) { - LIBS *= -lcap - } - - CONFIG(static):!macx { - QMAKE_LFLAGS *= -static - } - - !macx:CONFIG(buildenv) { - QMAKE_LFLAGS *= -Wl,-rpath,$$(MUMBLE_PREFIX)/lib:$$(MUMBLE_ICE_PREFIX)/lib - } - - HEADERS *= UnixMurmur.h - SOURCES *= UnixMurmur.cpp - TARGET = murmurd -} - -macx { - CONFIG -= app_bundle - LIBS *= -framework Security - QMAKE_LFLAGS += -sectcreate __TEXT __info_plist murmur.plist -} - -dbus { - DEFINES *= USE_DBUS - QT *= dbus - HEADERS *= DBus.h - SOURCES *= DBus.cpp -} - -ice { - SOURCES *= MurmurIce.cpp - HEADERS *= MurmurIce.h - - win32:CONFIG(debug, debug|release) { - LIBS *= -lIceD -lIceUtilD - } else { - # check Ice version, 3.7 merged IceUtil into Ice - ICE_VERSION = $$system(slice2cpp --version 2>&1) - ICE_MAJOR_VERSION = $$section(ICE_VERSION, ., 0, 0) - ICE_MINOR_VERSION = $$section(ICE_VERSION, ., 1, 1) - - !equals(ICE_MAJOR_VERSION, 3) { - error("Unsupported Ice version") - } - lessThan(ICE_MINOR_VERSION, 7) { - # Ice < 3.7 - LIBS *= -lIce -lIceUtil - } else { - # Ice 3.7+ - LIBS *= -lIce - } - } - - DEFINES *= USE_ICE - - win32 { - INCLUDEPATH *= "$$ICE_PATH/include" - !CONFIG(static) { - QMAKE_LIBDIR *= "$$ICE_PATH/lib/vc100" - } else { - DEFINES *= ICE_STATIC_LIBS - QMAKE_LIBDIR *= $$BZIP2_PATH/lib - equals(MUMBLE_ARCH, x86) { - QMAKE_LIBDIR *= $$ICE_PATH/lib - } - equals(MUMBLE_ARCH, x86_64) { - QMAKE_LIBDIR *= $$ICE_PATH/lib/x64 - } - CONFIG(release, debug|release): LIBS *= -llibbz2 - CONFIG(debug, debug|release): LIBS *= -llibbz2d - LIBS *= -ldbghelp -liphlpapi -lrpcrt4 - } - } - - macx { - INCLUDEPATH *= $$(MUMBLE_PREFIX)/Ice-3.4.2/include/ - QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/Ice-3.4.2/lib/ - } - - unix:!macx:CONFIG(buildenv) { - INCLUDEPATH *= $$(MUMBLE_ICE_PREFIX)/include/ - QMAKE_LIBDIR *= $$(MUMBLE_ICE_PREFIX)/lib/ - } - - unix:!macx:CONFIG(static) { - LIBS *= -lbz2 - QMAKE_CXXFLAGS *= -fPIC - } - - macx:CONFIG(static) { - LIBS *= -lbz2 -liconv - QMAKE_CXXFLAGS *= -fPIC - } - - LIBS *= -lmurmur_ice - INCLUDEPATH *= murmur_ice - - unix { - QMAKE_CFLAGS *= "-isystem murmur_ice" - QMAKE_CXXFLAGS *= "-isystem murmur_ice" - } -} - -grpc { - isEqual(QT_MAJOR_VERSION, 4) { - error("Murmur's gRPC support requires Qt 5") - } - - DEFINES *= USE_GRPC - INCLUDEPATH *= murmur_grpc - LIBS *= -lmurmur_grpc - - HEADERS *= MurmurGRPCImpl.h - SOURCES *= MurmurGRPCImpl.cpp - - GRPC_WRAPPER = MurmurRPC.proto - grpc_wrapper.output = MurmurRPC.proto.Wrapper.cpp - grpc_wrapper.commands = $${PROTOC} --plugin=${DESTDIR}protoc-gen-murmur-grpcwrapper -I. --murmur-grpcwrapper_out=. MurmurRPC.proto - grpc_wrapper.input = GRPC_WRAPPER - grpc_wrapper.variable_out = - QMAKE_EXTRA_COMPILERS += grpc_wrapper - - unix { - QMAKE_CXXFLAGS *= -std=c++11 - must_pkgconfig(grpc) - must_pkgconfig(grpc++) - } -} - -bonjour { - DEFINES *= USE_BONJOUR - - HEADERS *= \ - ../../3rdparty/qqbonjour-src/BonjourRecord.h \ - ../../3rdparty/qqbonjour-src/BonjourServiceRegister.h \ - BonjourServer.h - SOURCES *= \ - ../../3rdparty/qqbonjour-src/BonjourServiceRegister.cpp \ - BonjourServer.cpp - INCLUDEPATH *= ../../3rdparty/qqbonjour-src - win32 { - INCLUDEPATH *= "$$BONJOUR_PATH/include" - QMAKE_LIBDIR *= "$$BONJOUR_PATH/lib/win32" - LIBS *= -lDNSSD - } - unix:!macx { - system($$PKG_CONFIG --exists avahi-compat-libdns_sd avahi-client) { - must_pkgconfig(avahi-compat-libdns_sd) - must_pkgconfig(avahi-client) - } else { - LIBS *= -ldns_sd - } - } -} - -# Check for QSslDiffieHellmanParameters availability, and define -# USE_QSSLDIFFIEHELLMANPARAMETERS preprocessor if available. -# -# Can be disabled with no-qssldiffiehellmanparameters. -!CONFIG(no-qssldiffiehellmanparameters):exists($$[QT_INSTALL_HEADERS]/QtNetwork/QSslDiffieHellmanParameters) { - DEFINES += USE_QSSLDIFFIEHELLMANPARAMETERS -} - -include(../../qmake/symbols.pri) diff --git a/src/murmur/murmur_grpc/murmur_grpc.pro b/src/murmur/murmur_grpc/murmur_grpc.pro deleted file mode 100644 index 4cadaa914..000000000 --- a/src/murmur/murmur_grpc/murmur_grpc.pro +++ /dev/null @@ -1,67 +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) -include(../../../qmake/protoc.pri) - -GRPC_CPP_PLUGIN = $${MUMBLE_GRPC_CPP_PLUGIN} - -# If the MUMBLE_GRPC_CPP_PLUGIN environment variable isn't set -isEmpty(GRPC_CPP_PLUGIN) { - # If we're building from Windows, use "grpc_cpp_plugin" - equals(QMAKE_HOST.os, "Windows") { - GRPC_CPP_PLUGIN = grpc_cpp_plugin - } else { - GRPC_CPP_PLUGIN = $$system(which grpc_cpp_plugin) - } -} - -GRPC *= ../MurmurRPC.proto - -grpc_pbh.output = ${QMAKE_FILE_BASE}.pb.h -grpc_pbh.depends = ${QMAKE_FILE_BASE}.pb.cc -grpc_pbh.commands = $$escape_expand(\\n) -grpc_pbh.input = GRPC -grpc_pbh.CONFIG *= no_link explicit_dependencies target_predeps -grpc_pbh.variable_out = HEADERS - -grpc_pb.output = ${QMAKE_FILE_BASE}.pb.cc -grpc_pb.commands = $${PROTOC} --cpp_out=. -I. -I.. ${QMAKE_FILE_NAME} -grpc_pb.input = GRPC -grpc_pb.CONFIG *= no_link explicit_dependencies -grpc_pb.variable_out = SOURCES - -grpch.output = ${QMAKE_FILE_BASE}.grpc.pb.h -grpch.depends = ${QMAKE_FILE_BASE}.grpc.pb.cc -grpch.commands = $$escape_expand(\\n) -grpch.input = GRPC -grpch.CONFIG *= no_link explicit_dependencies target_predeps - -grpc.output = ${QMAKE_FILE_BASE}.grpc.pb.cc -grpc.depends = ${QMAKE_FILE_BASE}.pb.h -grpc.commands = $${PROTOC} --grpc_out=. --plugin=protoc-gen-grpc=$${GRPC_CPP_PLUGIN} -I. -I.. ${QMAKE_FILE_NAME} -grpc.input = GRPC -grpc.CONFIG *= no_link explicit_dependencies -grpc.variable_out = SOURCES - -TEMPLATE = lib -CONFIG -= qt -CONFIG += debug_and_release -CONFIG += staticlib - -QMAKE_EXTRA_COMPILERS *= grpc_pb grpc_pbh grpc grpch - -!CONFIG(third-party-warnings) { - # We ignore warnings in third party builds. We won't actually look - # at them and they clutter out our warnings. - CONFIG -= warn_on - CONFIG += warn_off -} - -unix { - QMAKE_CXXFLAGS *= -std=c++11 -} - -include(../../../qmake/symbols.pri) diff --git a/src/murmur/murmur_ice/murmur_ice.pro b/src/murmur/murmur_ice/murmur_ice.pro deleted file mode 100644 index 6884ac857..000000000 --- a/src/murmur/murmur_ice/murmur_ice.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) - -SLICEFILES = ../Murmur.ice - -slice.output = ${QMAKE_FILE_BASE}.cpp -win32 { - slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME} -} else { - ICE_VERSION = $$system(slice2cpp --version 2>&1) - EXTRA_SLICEFLAGS = - !isEmpty(ICE_VERSION) { - EXTRA_SLICEFLAGS = -I/usr/share/Ice-$$ICE_VERSION/slice/ - } - slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/ice/slice -I/usr/share/slice $$EXTRA_SLICEFLAGS ${QMAKE_FILE_NAME} -} -slice.input = SLICEFILES -slice.CONFIG *= no_link explicit_dependencies -slice.variable_out = SOURCES - -sliceh.output = ${QMAKE_FILE_BASE}.h -sliceh.depends = ${QMAKE_FILE_BASE}.cpp -sliceh.commands = $$escape_expand(\\n) -sliceh.input = SLICEFILES -sliceh.CONFIG *= no_link explicit_dependencies target_predeps - -TEMPLATE = lib -CONFIG -= qt -CONFIG += debug_and_release -CONFIG += staticlib - -QMAKE_EXTRA_COMPILERS *= slice sliceh - -win32 { - INCLUDEPATH *= "$$ICE_PATH/include" - CONFIG(static) { - DEFINES *= ICE_STATIC_LIBS - } -} - -macx { - MUMBLE_ICE_PREFIX = $$(MUMBLE_ICE_PREFIX) - isEmpty(MUMBLE_ICE_PREFIX) { - MUMBLE_ICE_PREFIX = $$(MUMBLE_PREFIX)/Ice-3.4.2 - } - INCLUDEPATH *= $$MUMBLE_ICE_PREFIX/include/ - slice.commands = $$MUMBLE_ICE_PREFIX/bin/slice2cpp --checksum -I$$MUMBLE_ICE_PREFIX/slice/ -I$$MUMBLE_ICE_PREFIX/share/slice/ -I$$MUMBLE_ICE_PREFIX/share/ice/slice ../Murmur.ice -} - -unix:!macx:CONFIG(buildenv) { - INCLUDEPATH *= $$(MUMBLE_ICE_PREFIX)/include/ - slice.commands = $$(MUMBLE_ICE_PREFIX)/bin/slice2cpp --checksum -I$$(MUMBLE_ICE_PREFIX)/slice/ ../Murmur.ice -} - -macx:CONFIG(static) { - LIBS *= -lbz2 -liconv - QMAKE_CXXFLAGS *= -fPIC -} - -!CONFIG(third-party-warnings) { - # We ignore warnings in third party builds. We won't actually look - # at them and they clutter out our warnings. - CONFIG -= warn_on - CONFIG += warn_off -} - -include(../../../qmake/symbols.pri) diff --git a/src/murmur_grpcwrapper_protoc_plugin/murmur_grpcwrapper_protoc_plugin.pro b/src/murmur_grpcwrapper_protoc_plugin/murmur_grpcwrapper_protoc_plugin.pro deleted file mode 100644 index d19cffe0d..000000000 --- a/src/murmur_grpcwrapper_protoc_plugin/murmur_grpcwrapper_protoc_plugin.pro +++ /dev/null @@ -1,17 +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(../mumble.pri) - -TEMPLATE = app -TARGET = protoc-gen-murmur-grpcwrapper -LANGUAGE = C++ -SOURCES = main.cpp -LIBS = -lprotoc -CONFIG -= qt -CONFIG += c++11 -must_pkgconfig(protobuf) - -include(../../qmake/symbols.pri) diff --git a/src/tests/Benchmark.pro b/src/tests/Benchmark.pro deleted file mode 100644 index 30a3376ee..000000000 --- a/src/tests/Benchmark.pro +++ /dev/null @@ -1,15 +0,0 @@ -include(../mumble.pri) - -TEMPLATE = app -CONFIG *= qt thread warn_on network qtestlib debug -CONFIG -= app_bundle -QT *= network xml -LANGUAGE = C++ -TARGET = Benchmark -SOURCES *= Benchmark.cpp Timer.cpp crypto/CryptStateOCB2.cpp -HEADERS *= Timer.h crypto/CryptState.h crypto/CryptStateOCB2.h -VPATH *= .. -INCLUDEPATH *= .. ../murmur ../mumble -!win32 { - LIBS *= -lcrypto -} diff --git a/src/tests/Collections.pro b/src/tests/Collections.pro deleted file mode 100644 index babde37ff..000000000 --- a/src/tests/Collections.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = app -CONFIG += qt thread warn_on release -CONFIG -= app_bundle -LANGUAGE = C++ -TARGET = Collections -SOURCES = Collections.cpp Timer.cpp -VPATH += .. -INCLUDEPATH += .. ../murmur ../mumble diff --git a/src/tests/Emit.pro b/src/tests/Emit.pro deleted file mode 100644 index 518e91814..000000000 --- a/src/tests/Emit.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -CONFIG += qt thread warn_on release no_keywords -CONFIG -= app_bundle -LANGUAGE = C++ -TARGET = Emit -HEADERS = Timer.h -SOURCES = Emit.cpp Timer.cpp -VPATH += .. -INCLUDEPATH += .. ../murmur ../mumble -LIBS += -lboost_signals -QMAKE_CXXFLAGS *= -O3 diff --git a/src/tests/Hash.pro b/src/tests/Hash.pro deleted file mode 100644 index c21c91ece..000000000 --- a/src/tests/Hash.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE =app -CONFIG += qt thread warn_on qtestlib debug -LANGUAGE = C++ -TARGET = Hash -SOURCES = Hash.cpp Timer.cpp -HEADERS = Timer.h -VPATH += .. -INCLUDEPATH += .. ../murmur ../mumble diff --git a/src/tests/Lock.pro b/src/tests/Lock.pro deleted file mode 100644 index e9d5811cd..000000000 --- a/src/tests/Lock.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -CONFIG += qt thread warn_on network qdbus xml qtestlib sql debug -CONFIG -= app_bundle -QT += qdbus xml sql network -LANGUAGE = C++ -TARGET = Lock -SOURCES = Lock.cpp Timer.cpp -HEADERS = Timer.h -VPATH += .. -INCLUDEPATH += .. ../murmur ../mumble -QMAKE_CXXFLAGS += -O3 -fno-inline -save-temps diff --git a/src/tests/OverlayTest.pro b/src/tests/OverlayTest.pro deleted file mode 100644 index 8af0f6bed..000000000 --- a/src/tests/OverlayTest.pro +++ /dev/null @@ -1,18 +0,0 @@ -include(../../qmake/compiler.pri) - -TEMPLATE = app -CONFIG += qt thread warn_on debug console -CONFIG -= app_bundle -QT += network gui -LANGUAGE = C++ -TARGET = OverlayTest -HEADERS = ../mumble/SharedMemory.h -SOURCES = OverlayTest.cpp ../mumble/SharedMemory.cpp -win32 { - SOURCES += ../mumble/SharedMemory_win.cpp -} else { - SOURCES += ../mumble/SharedMemory_unix.cpp -} - -VPATH += .. -INCLUDEPATH += .. ../murmur ../mumble ../../3rdparty/celt-0.7.0-src/libcelt ../../3rdparty/speex-src/include diff --git a/src/tests/ProtoBuf.pro b/src/tests/ProtoBuf.pro deleted file mode 100644 index 5a7d1d878..000000000 --- a/src/tests/ProtoBuf.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = app -CONFIG += qt thread warn_on release qtestlib no_keywords -CONFIG -= app_bundle -LANGUAGE = C++ -TARGET = ProtoBuf -HEADERS = Message.h Timer.h -PROTOS = ProtoBuf.proto -SOURCES = ProtoBuf.cpp Timer.cpp Message.cpp ProtoBuf.pb.cc -VPATH += .. proto -INCLUDEPATH += .. ../murmur ../mumble proto -LIBS += -lboost_signals -lprotobuf -QMAKE_CXXFLAGS *= -O3 -DEFINES *= NDEBUG - -protoc.output = ${QMAKE_FILE_BASE}.pb.cc ${QMAKE_FILE_BASE}.pb.h -protoc.commands = protoc ${QMAKE_FILE_NAME} --cpp_out=. -protoc.input = PROTOS -protoc.CONFIG *= no_link target_predeps - -QMAKE_EXTRA_COMPILERS *= protoc diff --git a/src/tests/Resample.pro b/src/tests/Resample.pro deleted file mode 100644 index 36f753ffe..000000000 --- a/src/tests/Resample.pro +++ /dev/null @@ -1,31 +0,0 @@ -include(../../qmake/compiler.pri) -TEMPLATE = app -CONFIG += qt thread warn_on release qtestlib no_keywords console -CONFIG -= app_bundle -LANGUAGE = C++ -TARGET = Resample -SOURCES = Resample.cpp Timer.cpp -HEADERS = Timer.h -VPATH += .. -INCLUDEPATH *= .. ../../3rdparty/speex-src/include ../../3rdparty/speex-src/libspeex ../../3rdparty/speex-build -LIBS *= -lspeex - -win32 { - CONFIG(intelcpp) { - LIBS *= -l"\Program Files (x86)\Intel/Compiler\11.0\075\cpp\ipp\ia32\lib\ippsemerged" - LIBS *= -l"\Program Files (x86)\Intel/Compiler\11.0\075\cpp\ipp\ia32\lib\ippsmerged" - LIBS *= -l"\Program Files (x86)\Intel/Compiler\11.0\075\cpp\ipp\ia32\lib\ippsremerged" - LIBS *= -l"\Program Files (x86)\Intel/Compiler\11.0\075\cpp\ipp\ia32\lib\ippsrmerged" - LIBS *= -l"\Program Files (x86)\Intel/Compiler\11.0\075\cpp\ipp\ia32\lib\ippcorel" - } -} - -CONFIG(debug, debug|release) { - QMAKE_LIBDIR = ../../debug $$QMAKE_LIBDIR - DESTDIR = ../../debug -} - -CONFIG(release, debug|release) { - QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR - DESTDIR = ../../release -} diff --git a/src/tests/TestCrypt/TestCrypt.pro b/src/tests/TestCrypt/TestCrypt.pro deleted file mode 100644 index 6535e4b19..000000000 --- a/src/tests/TestCrypt/TestCrypt.pro +++ /dev/null @@ -1,14 +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(../test.pri) - -QT *= network - -TARGET = TestCrypt -HEADERS *= SSL.h SSLLocks.h Timer.h crypto/CryptState.h crypto/CryptStateOCB2.h -SOURCES *= SSL.cpp SSLLocks.cpp TestCrypt.cpp crypto/CryptStateOCB2.cpp Timer.cpp - -win32:LIBS *= -lws2_32 diff --git a/src/tests/TestCryptographicHash/TestCryptographicHash.pro b/src/tests/TestCryptographicHash/TestCryptographicHash.pro deleted file mode 100644 index dc5b256c8..000000000 --- a/src/tests/TestCryptographicHash/TestCryptographicHash.pro +++ /dev/null @@ -1,12 +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(../test.pri) - -QT += network - -TARGET = TestCryptographicHash -SOURCES *= SSL.cpp SSLLocks.cpp TestCryptographicHash.cpp crypto/CryptographicHash.cpp -HEADERS *= SSL.h SSLLocks.h crypto/CryptographicHash.h diff --git a/src/tests/TestCryptographicRandom/TestCryptographicRandom.pro b/src/tests/TestCryptographicRandom/TestCryptographicRandom.pro deleted file mode 100644 index c6625f3f9..000000000 --- a/src/tests/TestCryptographicRandom/TestCryptographicRandom.pro +++ /dev/null @@ -1,15 +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(../test.pri) - -QT += network - -TARGET = TestCryptographicRandom -SOURCES *= SSL.cpp SSLLocks.cpp TestCryptographicRandom.cpp crypto/CryptographicRandom.cpp arc4random_uniform.cpp -HEADERS *= SSL.h SSLLocks.h crypto/CryptographicHash.h - -VPATH *= ../../../3rdparty/arc4random-src -INCLUDEPATH *= ../../../3rdparty/arc4random-src diff --git a/src/tests/TestFFDHE/TestFFDHE.pro b/src/tests/TestFFDHE/TestFFDHE.pro deleted file mode 100644 index 0627d0f45..000000000 --- a/src/tests/TestFFDHE/TestFFDHE.pro +++ /dev/null @@ -1,20 +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(../test.pri) - -QT += network - -# Check for QSslDiffieHellmanParameters availability, and define -# USE_QSSLDIFFIEHELLMANPARAMETERS preprocessor if available. -# -# Can be disabled with no-qssldiffiehellmanparameters. -!CONFIG(no-qssldiffiehellmanparameters):exists($$[QT_INSTALL_HEADERS]/QtNetwork/QSslDiffieHellmanParameters) { - DEFINES += USE_QSSLDIFFIEHELLMANPARAMETERS -} - -TARGET = TestFFDHE -SOURCES *= SSL.cpp SSLLocks.cpp FFDHE.cpp TestFFDHE.cpp -HEADERS *= SSL.h SSLLocks.h FFDHE.h FFDHETable.h diff --git a/src/tests/TestLink.pro b/src/tests/TestLink.pro deleted file mode 100644 index f4101d4c2..000000000 --- a/src/tests/TestLink.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE =app -CONFIG += qt thread warn_on debug console -CONFIG -= app_bundle -LANGUAGE = C++ -TARGET = TestLink -SOURCES = TestLink.cpp -INCLUDEPATH += ../../plugins - diff --git a/src/tests/TestPacketDataStream/TestPacketDataStream.pro b/src/tests/TestPacketDataStream/TestPacketDataStream.pro deleted file mode 100644 index f4ea40b54..000000000 --- a/src/tests/TestPacketDataStream/TestPacketDataStream.pro +++ /dev/null @@ -1,11 +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(../test.pri) - -QT *= network - -TARGET = TestPacketDataStream -SOURCES *= TestPacketDataStream.cpp diff --git a/src/tests/TestPasswordGenerator/TestPasswordGenerator.pro b/src/tests/TestPasswordGenerator/TestPasswordGenerator.pro deleted file mode 100644 index 77a30e92c..000000000 --- a/src/tests/TestPasswordGenerator/TestPasswordGenerator.pro +++ /dev/null @@ -1,15 +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(../test.pri) - -QT += network - -TARGET = TestPasswordGenerator -SOURCES *= SSL.cpp SSLLocks.cpp TestPasswordGenerator.cpp PasswordGenerator.cpp crypto/CryptographicRandom.cpp arc4random_uniform.cpp -HEADERS *= SSL.h SSLLocks.h PasswordGenerator.h crypto/CryptographicHash.h - -VPATH *= ../../../3rdparty/arc4random-src -INCLUDEPATH *= ../../../3rdparty/arc4random-src diff --git a/src/tests/TestSSLLocks/TestSSLLocks.pro b/src/tests/TestSSLLocks/TestSSLLocks.pro deleted file mode 100644 index edaef7f3e..000000000 --- a/src/tests/TestSSLLocks/TestSSLLocks.pro +++ /dev/null @@ -1,12 +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(../test.pri) - -QT += network - -TARGET = TestSSLLocks -SOURCES *= SSL.cpp SSLLocks.cpp TestSSLLocks.cpp -HEADERS *= SSL.h SSLLocks.h diff --git a/src/tests/TestSelfSignedCertificate/TestSelfSignedCertificate.pro b/src/tests/TestSelfSignedCertificate/TestSelfSignedCertificate.pro deleted file mode 100644 index 6e160618d..000000000 --- a/src/tests/TestSelfSignedCertificate/TestSelfSignedCertificate.pro +++ /dev/null @@ -1,13 +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(../test.pri) -include(../../../qmake/qt.pri) - -QT *= network - -TARGET = TestSelfSignedCertificate -SOURCES *= SSL.cpp SSLLocks.cpp TestSelfSignedCertificate.cpp SelfSignedCertificate.cpp -HEADERS *= SSL.h SSLLocks.h SelfSignedCertificate.h diff --git a/src/tests/TestServerAddress/TestServerAddress.pro b/src/tests/TestServerAddress/TestServerAddress.pro deleted file mode 100644 index 5c034524a..000000000 --- a/src/tests/TestServerAddress/TestServerAddress.pro +++ /dev/null @@ -1,14 +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(../test.pri) - -QT += network - -TARGET = TestServerAddress -SOURCES *= TestServerAddress.cpp ServerAddress.cpp HostAddress.cpp -HEADERS *= ServerAddress.h HostAddress.h - -win32:LIBS *= -lws2_32 diff --git a/src/tests/TestServerResolver/TestServerResolver.pro b/src/tests/TestServerResolver/TestServerResolver.pro deleted file mode 100644 index 1b6e5c5d5..000000000 --- a/src/tests/TestServerResolver/TestServerResolver.pro +++ /dev/null @@ -1,15 +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(../test.pri) -include(../../../qmake/qt.pri) - -QT *= network - -TARGET = TestServerResolver -SOURCES *= TestServerResolver.cpp HostAddress.cpp ServerResolver.cpp ServerResolverRecord.cpp -HEADERS *= HostAddress.h ServerResolver.h ServerResolverRecord.h - -win32:LIBS *= -lws2_32 diff --git a/src/tests/TestStdAbs/TestStdAbs.pro b/src/tests/TestStdAbs/TestStdAbs.pro deleted file mode 100644 index 8d3032410..000000000 --- a/src/tests/TestStdAbs/TestStdAbs.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>. - -include(../test.pri) - -TARGET = TestStdAbs -SOURCES *= TestStdAbs.cpp diff --git a/src/tests/TestTimer/TestTimer.pro b/src/tests/TestTimer/TestTimer.pro deleted file mode 100644 index 2525fbd35..000000000 --- a/src/tests/TestTimer/TestTimer.pro +++ /dev/null @@ -1,10 +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(../test.pri) - -TARGET = TestTimer -SOURCES *= TestTimer.cpp Timer.cpp -HEADERS *= Timer.h diff --git a/src/tests/TestUnresolvedServerAddress/TestUnresolvedServerAddress.pro b/src/tests/TestUnresolvedServerAddress/TestUnresolvedServerAddress.pro deleted file mode 100644 index 40f7969a9..000000000 --- a/src/tests/TestUnresolvedServerAddress/TestUnresolvedServerAddress.pro +++ /dev/null @@ -1,10 +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(../test.pri) - -TARGET = TestUnresolvedServerAddress -SOURCES *= TestUnresolvedServerAddress.cpp UnresolvedServerAddress.cpp -HEADERS *= UnresolvedServerAddress.h diff --git a/src/tests/TestXMLTools/TestXMLTools.pro b/src/tests/TestXMLTools/TestXMLTools.pro deleted file mode 100644 index b46d50397..000000000 --- a/src/tests/TestXMLTools/TestXMLTools.pro +++ /dev/null @@ -1,10 +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(../test.pri) - -TARGET = TestXMLTools -HEADERS *= XMLTools.h -SOURCES *= TestXMLTools.cpp XMLTools.cpp diff --git a/src/tests/test.pri b/src/tests/test.pri deleted file mode 100644 index 797f77e00..000000000 --- a/src/tests/test.pri +++ /dev/null @@ -1,30 +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>. - -# Common include file for tests. - -include(../../qmake/compiler.pri) - -TEMPLATE = app -QT = core testlib -CONFIG += testcase -CONFIG += thread warn_on -CONFIG -= app_bundle - -LANGUAGE = C++ - -VPATH *= ../.. ../../murmur ../../mumble -INCLUDEPATH *= ../.. ../../murmur ../../mumble - -SOURCES += PlatformCheck.cpp -HEADERS += PlatformCheck.h - -# We have to depend on OpenSSL in all tests -# for no-pch builds to work. Our PCH headers -# include OpenSSL, and if the headers aren't -# in the include path, the build will break. -include(../../qmake/openssl.pri) - -DESTDIR = $$DESTDIR/tests diff --git a/src/tests/tests.pro b/src/tests/tests.pro deleted file mode 100644 index 9bda1b54e..000000000 --- a/src/tests/tests.pro +++ /dev/null @@ -1,22 +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>. - -TEMPLATE = subdirs - -SUBDIRS += \ - TestCrypt \ - TestCryptographicHash \ - TestCryptographicRandom \ - TestPacketDataStream \ - TestPasswordGenerator \ - TestTimer \ - TestXMLTools \ - TestUnresolvedServerAddress \ - TestServerAddress \ - TestServerResolver \ - TestSelfSignedCertificate \ - TestSSLLocks \ - TestFFDHE \ - TestStdAbs |