mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2905: Move .pri files to the "qmake" folder

Browse Source
This commit is contained in:
Mikkel Krautz 2017-03-05 17:12:42 +01:00 committed by GitHub
commit 48ca9e002b
52 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro vendored
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-build,-src)
@ -67,4 +67,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../release
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

4
3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro vendored
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-build,-src)
@ -74,4 +74,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../release
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

2
3rdparty/mach-override-build/mach-override-build.pro vendored
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-build,-src)

2
3rdparty/minhook-build/minhook-build.pro vendored
View File

@ -1,5 +1,5 @@
CONFIG += force-x86_64-toolchain
include(../../compiler.pri)
include(../../qmake/compiler.pri)
BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-build,-src)

4
3rdparty/opus-build/opus-build.pro vendored
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-build,-src)
@ -281,4 +281,4 @@ macx:!CONFIG(static) {
ALL_DEPS += libname
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

4
3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro vendored
View File

@ -1,4 +1,4 @@
include (../../compiler.pri)
include (../../qmake/compiler.pri)
BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-helper-build,-src)
@ -76,4 +76,4 @@ CONFIG(debug, debug|release) {
DESTDIR = ../../debug/
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

4
3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro vendored
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-lib-build,-src)
@ -61,4 +61,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../release
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

2
3rdparty/speex-build/AGC.pro vendored
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
TEMPLATE =app
CONFIG += qt warn_on release console

2
3rdparty/speex-build/ResampMark.pro vendored
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
TEMPLATE =app
CONFIG += qt warn_on release console

2
3rdparty/speex-build/SpeexMark.pro vendored
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
TEMPLATE =app
CONFIG += qt warn_on release console

2
3rdparty/speex-build/speex-build.pro vendored
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
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:")

4
3rdparty/xinputcheck-build/xinputcheck-build.pro vendored
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-lib-build,-src)
@ -24,4 +24,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../release
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

4
g15helper/g15helper.pro
View File

@ -8,7 +8,7 @@
win32:!CONFIG(g15-emulator) {
CONFIG += force-x86-toolchain
}
include (../compiler.pri)
include (../qmake/compiler.pri)
TEMPLATE = app
CONFIG *= debug_and_release warn_on
@ -98,4 +98,4 @@ CONFIG(debug, debug|release) {
DESTDIR = ../debug/
}
include(../symbols.pri)
include(../qmake/symbols.pri)

4
macx/compat/compat.pro
View File

@ -6,7 +6,7 @@
# Tiny stub program that we splice together into our
# main app bundle for architectures that we don't support.
include(../../compiler.pri)
include(../../qmake/compiler.pri)
include(../common.pri)
TEMPLATE = app
@ -39,4 +39,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../release
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

4
macx/osax/osax.pro
View File

@ -6,7 +6,7 @@
# Mumble Overlay scripting addition
# (for injection into running processes)
include(../../compiler.pri)
include(../../qmake/compiler.pri)
CONFIG += x86_64 x86 debug_and_release
CONFIG(universal) {
@ -43,4 +43,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../release
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

2
overlay/overlay-shared.pro
View File

@ -3,7 +3,7 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include (../compiler.pri)
include (../qmake/compiler.pri)
VERSION = 1.3.0
TARGET_EXT = .dll

4
overlay/overlay_exe/overlay_exe-shared.pro
View File

@ -3,7 +3,7 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include(../../compiler.pri)
include(../../qmake/compiler.pri)
TEMPLATE = app
CONFIG -= qt
@ -40,4 +40,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../release
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

4
overlay_gl/overlay_gl.pro
View File

@ -5,7 +5,7 @@
# Overlay payload for Unix-like systems and OS X.
include(../compiler.pri)
include(../qmake/compiler.pri)
TEMPLATE = lib
CONFIG -= qt gui
@ -67,4 +67,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../release$(DESTDIR_ADD)
}
include(../symbols.pri)
include(../qmake/symbols.pri)

4
plugins/plugins.pri
View File

@ -3,7 +3,7 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include(../compiler.pri)
include(../qmake/compiler.pri)
TEMPLATE = lib
CONFIG += plugin debug_and_release warn_on
@ -29,4 +29,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../release/plugins
}
include(../symbols.pri)
include(../qmake/symbols.pri)

2
plugins/plugins.pro
View File

@ -3,7 +3,7 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include(../compiler.pri)
include(../qmake/compiler.pri)
TEMPLATE = subdirs

0
buildenv.pri → qmake/buildenv.pri
View File

0
compiler.pri → qmake/compiler.pri
View File

0
cplusplus.pri → qmake/cplusplus.pri
View File

0
lrelease.pri → qmake/lrelease.pri
View File

2
qmake/openssl.pri
View File

@ -3,7 +3,7 @@
# 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(pkgconfig.pri)
# Include this file to portably link
# against OpenSSL.

0
pkgconfig.pri → qmake/pkgconfig.pri
View File

0
protoc.pri → qmake/protoc.pri
View File

0
python.pri → qmake/python.pri
View File

0
qt.pri → qmake/qt.pri
View File

0
rcc.pri → qmake/rcc.pri
View File

0
symbols.pri → qmake/symbols.pri
View File

0
toolchain/win32-msvc2013/x64.toolchain → qmake/toolchain/win32-msvc2013/x64.toolchain
View File

0
toolchain/win32-msvc2013/x86-xp.toolchain → qmake/toolchain/win32-msvc2013/x86-xp.toolchain
View File

0
toolchain/win32-msvc2013/x86.toolchain → qmake/toolchain/win32-msvc2013/x86.toolchain
View File

0
toolchain/win32-msvc2015/x64.toolchain → qmake/toolchain/win32-msvc2015/x64.toolchain
View File

0
toolchain/win32-msvc2015/x86-xp.toolchain → qmake/toolchain/win32-msvc2015/x86-xp.toolchain
View File

0
toolchain/win32-msvc2015/x86.toolchain → qmake/toolchain/win32-msvc2015/x86.toolchain
View File

0
uname.pri → qmake/uname.pri
View File

0
winpaths_default.pri → qmake/winpaths_default.pri
View File

0
winpaths_static.pri → qmake/winpaths_static.pri
View File

2
scripts/development/IconSync.pro
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
TEMPLATE = app
CONFIG += qt thread warn_on debug console

8
src/mumble.pri
View File

@ -3,10 +3,10 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include(../compiler.pri)
include(../qt.pri)
include(../rcc.pri)
include(../pkgconfig.pri)
include(../qmake/compiler.pri)
include(../qmake/qt.pri)
include(../qmake/rcc.pri)
include(../qmake/pkgconfig.pri)
VERSION = 1.3.0
DIST = mumble.pri Message.h PacketDataStream.h CryptState.h Timer.h Version.h OSInfo.h SSL.h

6
src/mumble/mumble.pro
View File

@ -4,8 +4,8 @@
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include(../mumble.pri)
include(../../python.pri)
include(../../lrelease.pri)
include(../../qmake/python.pri)
include(../../qmake/lrelease.pri)
DEFINES *= MUMBLE
TEMPLATE = app
@ -696,4 +696,4 @@ lrel.variable_out = rcc.depends
QMAKE_EXTRA_COMPILERS *= lrel
include(../../symbols.pri)
include(../../qmake/symbols.pri)

4
src/mumble_exe/mumble_exe.pro
View File

@ -3,7 +3,7 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include(../../compiler.pri)
include(../../qmake/compiler.pri)
TEMPLATE = app
CONFIG -= qt
@ -46,4 +46,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../release
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

6
src/mumble_proto/mumble_proto.pro
View File

@ -3,8 +3,8 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include(../../compiler.pri)
include(../../protoc.pri)
include(../../qmake/compiler.pri)
include(../../qmake/protoc.pri)
PROTOBUF *= ../Mumble.proto
@ -45,4 +45,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../release
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

4
src/murmur/murmur.pro
View File

@ -4,7 +4,7 @@
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include(../mumble.pri)
include(../../protoc.pri)
include(../../qmake/protoc.pri)
DEFINES *= MURMUR
TEMPLATE =app
@ -203,4 +203,4 @@ bonjour {
DEFINES += USE_QSSLDIFFIEHELLMANPARAMETERS
}
include(../../symbols.pri)
include(../../qmake/symbols.pri)

6
src/murmur/murmur_grpc/murmur_grpc.pro
View File

@ -3,8 +3,8 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include(../../../compiler.pri)
include(../../../protoc.pri)
include(../../../qmake/compiler.pri)
include(../../../qmake/protoc.pri)
GRPC *= ../MurmurRPC.proto
@ -60,4 +60,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../../release
}
include(../../../symbols.pri)
include(../../../qmake/symbols.pri)

4
src/murmur/murmur_ice/murmur_ice.pro
View File

@ -3,7 +3,7 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
include(../../../compiler.pri)
include(../../../qmake/compiler.pri)
SLICEFILES = ../Murmur.ice
@ -77,4 +77,4 @@ CONFIG(release, debug|release) {
DESTDIR = ../../../release
}
include(../../../symbols.pri)
include(../../../qmake/symbols.pri)

2
src/murmur_grpcwrapper_protoc_plugin/murmur_grpcwrapper_protoc_plugin.pro
View File

@ -14,4 +14,4 @@ CONFIG -= qt
CONFIG += c++11
must_pkgconfig(protobuf)
include(../../symbols.pri)
include(../../qmake/symbols.pri)

2
src/tests/OverlayTest.pro
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
TEMPLATE = app
CONFIG += qt thread warn_on debug console

2
src/tests/Resample.pro
View File

@ -1,4 +1,4 @@
include(../../compiler.pri)
include(../../qmake/compiler.pri)
TEMPLATE = app
CONFIG += qt thread warn_on release qtestlib no_keywords console
CONFIG -= app_bundle

2
src/tests/test.pri
View File

@ -5,7 +5,7 @@
# Common include file for tests.
include(../../compiler.pri)
include(../../qmake/compiler.pri)
TEMPLATE = app
QT = core testlib