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

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro6
-rw-r--r--3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro6
-rw-r--r--3rdparty/mach-override-build/mach-override-build.pro6
-rw-r--r--3rdparty/minhook-build/minhook-build.pro6
-rw-r--r--3rdparty/opus-build/opus-build.pro2
-rw-r--r--3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro6
-rw-r--r--3rdparty/speex-build/AGC.pro2
-rw-r--r--3rdparty/speex-build/ResampMark.pro2
-rw-r--r--3rdparty/speex-build/SpeexMark.pro2
-rw-r--r--3rdparty/speex-build/speex-build.pro8
-rw-r--r--3rdparty/xinputcheck-build/xinputcheck-build.pro6
-rw-r--r--overlay/overlay-shared.pro8
-rw-r--r--overlay/overlay_exe/overlay_exe-shared.pro4
-rw-r--r--plugins/aoc/aoc.pro6
-rw-r--r--plugins/arma2/arma2.pro6
-rw-r--r--plugins/bf1942/bf1942.pro6
-rw-r--r--plugins/bf2/bf2.pro6
-rw-r--r--plugins/bf2142/bf2142.pro6
-rw-r--r--plugins/bf3/bf3.pro6
-rw-r--r--plugins/bf4/bf4.pro6
-rw-r--r--plugins/bf4_x86/bf4_x86.pro6
-rw-r--r--plugins/bfbc2/bfbc2.pro6
-rw-r--r--plugins/bfheroes/bfheroes.pro6
-rw-r--r--plugins/blacklight/blacklight.pro6
-rw-r--r--plugins/borderlands/borderlands.pro6
-rw-r--r--plugins/borderlands2/borderlands2.pro6
-rw-r--r--plugins/breach/breach.pro6
-rw-r--r--plugins/cod2/cod2.pro6
-rw-r--r--plugins/cod4/cod4.pro6
-rw-r--r--plugins/cod5/cod5.pro6
-rw-r--r--plugins/codmw2/codmw2.pro6
-rw-r--r--plugins/codmw2so/codmw2so.pro6
-rw-r--r--plugins/cs/cs.pro6
-rw-r--r--plugins/css/css.pro8
-rw-r--r--plugins/dods/dods.pro8
-rw-r--r--plugins/dys/dys.pro6
-rw-r--r--plugins/etqw/etqw.pro6
-rwxr-xr-xplugins/ffxiv/ffxiv.pro6
-rwxr-xr-xplugins/ffxiv_x64/ffxiv_x64.pro6
-rw-r--r--plugins/gmod/gmod.pro6
-rw-r--r--plugins/gtaiv/gtaiv.pro6
-rw-r--r--plugins/gtav/gtav.pro6
-rw-r--r--plugins/gw/gw.pro6
-rw-r--r--plugins/hl2dm/hl2dm.pro8
-rw-r--r--plugins/insurgency/insurgency.pro6
-rwxr-xr-xplugins/jc2/jc2.pro6
-rw-r--r--plugins/l4d/l4d.pro6
-rw-r--r--plugins/link/link.pro8
-rw-r--r--plugins/lol/lol.pro6
-rw-r--r--plugins/lotro/lotro.pro8
-rw-r--r--plugins/ql/ql.pro6
-rw-r--r--plugins/sr/sr.pro6
-rw-r--r--plugins/sto/sto.pro8
-rw-r--r--plugins/tf2/tf2.pro8
-rw-r--r--plugins/ut2004/ut2004.pro6
-rw-r--r--plugins/ut3/ut3.pro6
-rw-r--r--plugins/ut99/ut99.pro6
-rw-r--r--plugins/wolfet/wolfet.pro6
-rw-r--r--plugins/wow/wow.pro6
-rw-r--r--plugins/wow_x64/wow_x64.pro6
-rw-r--r--src/mumble/mumble.pro66
-rw-r--r--src/mumble_exe/mumble_exe.pro4
-rw-r--r--src/mumble_proto/mumble_proto.pro2
-rw-r--r--src/murmur/murmur.pro12
-rw-r--r--src/tests/Hash.pro6
-rw-r--r--src/tests/Resample.pro18
-rw-r--r--src/tests/TestLink.pro6
67 files changed, 237 insertions, 237 deletions
diff --git a/3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro b/3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro
index 1d8c614c0..9b29af8da 100644
--- a/3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro
+++ b/3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro
@@ -14,7 +14,7 @@ TEMPLATE = lib
CONFIG -= qt
CONFIG += debug_and_release
CONFIG += no_include_pwd
-VPATH = ../$$SOURCEDIR/libcelt
+VPATH = ../$$SOURCEDIR/libcelt
TARGET = celt0
RC_FILE = celt-0.11.0.rc
DEFINES += HAVE_CONFIG_H
@@ -68,11 +68,11 @@ SOURCES *= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c
CONFIG(debug, debug|release) {
CONFIG += console
- DESTDIR = ../../debug
+ DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
- DESTDIR = ../../release
+ DESTDIR = ../../release
}
include(../../qmake/symbols.pri)
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
index 0ff2206d3..abfadbd4b 100644
--- 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
@@ -16,7 +16,7 @@ CONFIG += debug_and_release
CONFIG -= warn_on
CONFIG += warn_off
CONFIG += no_include_pwd
-VPATH = ../$$SOURCEDIR/libcelt
+VPATH = ../$$SOURCEDIR/libcelt
TARGET = celt0
RC_FILE = celt-0.7.0.rc
DEFINES += HAVE_CONFIG_H
@@ -75,11 +75,11 @@ SOURCES *= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c
CONFIG(debug, debug|release) {
CONFIG += console
- DESTDIR = ../../debug
+ DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
- DESTDIR = ../../release
+ DESTDIR = ../../release
}
include(../../qmake/symbols.pri)
diff --git a/3rdparty/mach-override-build/mach-override-build.pro b/3rdparty/mach-override-build/mach-override-build.pro
index 86eabd27b..f0c031741 100644
--- a/3rdparty/mach-override-build/mach-override-build.pro
+++ b/3rdparty/mach-override-build/mach-override-build.pro
@@ -10,11 +10,11 @@ SOURCEDIR=$$replace(BUILDDIR,-build,-src)
CONFIG(debug, debug|release) {
CONFIG += console
- DESTDIR = ../../debug
+ DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
- DESTDIR = ../../release
+ DESTDIR = ../../release
}
TEMPLATE = lib
@@ -30,7 +30,7 @@ CONFIG += x86_64 x86
CONFIG += warn_off
}
-VPATH = ../mach-override-src
+VPATH = ../mach-override-src
TARGET = mach-override
INCLUDEPATH = ../mach-override-src/ ../mach-override-src/libudis86
diff --git a/3rdparty/minhook-build/minhook-build.pro b/3rdparty/minhook-build/minhook-build.pro
index 5d1e15862..06b851e61 100644
--- a/3rdparty/minhook-build/minhook-build.pro
+++ b/3rdparty/minhook-build/minhook-build.pro
@@ -11,18 +11,18 @@ SOURCEDIR=$$replace(BUILDDIR,-build,-src)
CONFIG(debug, debug|release) {
CONFIG += console
- DESTDIR = ../../debug
+ DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
- DESTDIR = ../../release
+ DESTDIR = ../../release
}
TEMPLATE = lib
CONFIG -= qt
CONFIG += debug_and_release
CONFIG += staticlib
-VPATH = ../$$SOURCEDIR
+VPATH = ../$$SOURCEDIR
TARGET = minhook
INCLUDEPATH *= ../$$SOURCEDIR/src ../$$SOURCEDIR/src/hde ../$$SOURCEDIR/include
DEFINES += WIN32 _WINDOWS _USRDLL MINHOOK_EXPORTS
diff --git a/3rdparty/opus-build/opus-build.pro b/3rdparty/opus-build/opus-build.pro
index cb7d1f57a..2d51ec253 100644
--- a/3rdparty/opus-build/opus-build.pro
+++ b/3rdparty/opus-build/opus-build.pro
@@ -16,7 +16,7 @@ TEMPLATE = lib
CONFIG -= qt
CONFIG += debug_and_release
CONFIG += no_include_pwd
-VPATH = ../$$SOURCEDIR
+VPATH = ../$$SOURCEDIR
TARGET = opus
DEFINES += HAVE_CONFIG_H
diff --git a/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro b/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro
index 6b523ebbd..1ed09f417 100644
--- a/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro
+++ b/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro
@@ -25,7 +25,7 @@ CONFIG += debug_and_release
CONFIG -= warn_on
CONFIG += warn_off
CONFIG += static
-VPATH = ../$$SOURCEDIR/lib
+VPATH = ../$$SOURCEDIR/lib
TARGET = sbcelt
INCLUDEPATH = $$CELTDIR/libcelt
DEFINES += SBCELT_PREFIX_API
@@ -54,11 +54,11 @@ macx {
CONFIG(debug, debug|release) {
CONFIG += console
- DESTDIR = ../../debug
+ DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
- DESTDIR = ../../release
+ DESTDIR = ../../release
}
include(../../qmake/symbols.pri)
diff --git a/3rdparty/speex-build/AGC.pro b/3rdparty/speex-build/AGC.pro
index cef7c9297..cd2e0f0b4 100644
--- a/3rdparty/speex-build/AGC.pro
+++ b/3rdparty/speex-build/AGC.pro
@@ -1,6 +1,6 @@
include(../../qmake/compiler.pri)
-TEMPLATE =app
+TEMPLATE =app
CONFIG += qt warn_on release console
QT -= gui
TARGET = AGC
diff --git a/3rdparty/speex-build/ResampMark.pro b/3rdparty/speex-build/ResampMark.pro
index 7b741cce0..d3385b2f4 100644
--- a/3rdparty/speex-build/ResampMark.pro
+++ b/3rdparty/speex-build/ResampMark.pro
@@ -1,6 +1,6 @@
include(../../qmake/compiler.pri)
-TEMPLATE =app
+TEMPLATE =app
CONFIG += qt warn_on release console
QT -= gui
TARGET = ResampMark
diff --git a/3rdparty/speex-build/SpeexMark.pro b/3rdparty/speex-build/SpeexMark.pro
index 5ab7d0f0b..3c2f763a3 100644
--- a/3rdparty/speex-build/SpeexMark.pro
+++ b/3rdparty/speex-build/SpeexMark.pro
@@ -1,6 +1,6 @@
include(../../qmake/compiler.pri)
-TEMPLATE =app
+TEMPLATE =app
CONFIG += qt warn_on release console
QT -= gui
TARGET = SpeexMark
diff --git a/3rdparty/speex-build/speex-build.pro b/3rdparty/speex-build/speex-build.pro
index 451a91f42..f9f6930c9 100644
--- a/3rdparty/speex-build/speex-build.pro
+++ b/3rdparty/speex-build/speex-build.pro
@@ -15,11 +15,11 @@ include(../../qmake/compiler.pri)
CONFIG(debug, debug|release) {
CONFIG += console
- DESTDIR = ../../debug
+ DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
- DESTDIR = ../../release
+ DESTDIR = ../../release
}
TEMPLATE = lib
@@ -34,7 +34,7 @@ CONFIG += no_include_pwd
# below, and nmake is unable to figure out how to handle
# that.
CONFIG += no_batch
-VPATH = ../speex-src/libspeex ../speexdsp-src/libspeexdsp
+VPATH = ../speex-src/libspeex ../speexdsp-src/libspeexdsp
TARGET = speex
DEFINES += NDEBUG HAVE_CONFIG_H
@@ -61,7 +61,7 @@ win32 {
}
}
- SOURCES *= mumble_speex_init.c
+ SOURCES *= mumble_speex_init.c
CONFIG -= static
CONFIG += shared
diff --git a/3rdparty/xinputcheck-build/xinputcheck-build.pro b/3rdparty/xinputcheck-build/xinputcheck-build.pro
index 1404fde09..afa423676 100644
--- a/3rdparty/xinputcheck-build/xinputcheck-build.pro
+++ b/3rdparty/xinputcheck-build/xinputcheck-build.pro
@@ -9,7 +9,7 @@ CONFIG += debug_and_release
CONFIG -= warn_on
CONFIG += warn_off
CONFIG += static
-VPATH = ../xinputcheck-src
+VPATH = ../xinputcheck-src
TARGET = xinputcheck
INCLUDEPATH = ../$$SOURCEDIR
@@ -17,11 +17,11 @@ SOURCES *= xinputcheck.cpp
CONFIG(debug, debug|release) {
CONFIG += console
- DESTDIR = ../../debug
+ DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
- DESTDIR = ../../release
+ DESTDIR = ../../release
}
include(../../qmake/symbols.pri)
diff --git a/overlay/overlay-shared.pro b/overlay/overlay-shared.pro
index e7346ea3a..c12d9c7bb 100644
--- a/overlay/overlay-shared.pro
+++ b/overlay/overlay-shared.pro
@@ -22,11 +22,11 @@ DIST = overlay.h overlay.fx HardHook.h
DEFINES -= UNICODE
-QMAKE_CXXFLAGS_RELEASE -= -MD
-QMAKE_CXXFLAGS_DEBUG -= -MDd
+QMAKE_CXXFLAGS_RELEASE -= -MD
+QMAKE_CXXFLAGS_DEBUG -= -MDd
-QMAKE_CXXFLAGS_RELEASE *= -MT
-QMAKE_CXXFLAGS_DEBUG *= -MTd
+QMAKE_CXXFLAGS_RELEASE *= -MT
+QMAKE_CXXFLAGS_DEBUG *= -MTd
LIBS *= -ldxguid -luuid -lole32 -luser32 -ladvapi32
LIBS *= -ld3d9 -ld3d10 -ld3d11 -ld3dcompiler -ldxgi
diff --git a/overlay/overlay_exe/overlay_exe-shared.pro b/overlay/overlay_exe/overlay_exe-shared.pro
index 844e293d9..c2c6ffefb 100644
--- a/overlay/overlay_exe/overlay_exe-shared.pro
+++ b/overlay/overlay_exe/overlay_exe-shared.pro
@@ -32,12 +32,12 @@ QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote(mt.exe -nologo
CONFIG(debug, debug|release) {
CONFIG += console
DEFINES *= DEBUG
- DESTDIR = ../../debug
+ DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
DEFINES *= NDEBUG
- DESTDIR = ../../release
+ DESTDIR = ../../release
}
include(../../qmake/symbols.pri)
diff --git a/plugins/aoc/aoc.pro b/plugins/aoc/aoc.pro
index 17ae9d17a..f76a127c6 100644
--- a/plugins/aoc/aoc.pro
+++ b/plugins/aoc/aoc.pro
@@ -5,8 +5,8 @@
include(../plugins.pri)
-TARGET = aoc
-SOURCES = aoc.cpp
-LIBS += -luser32
+TARGET = aoc
+SOURCES = aoc.cpp
+LIBS += -luser32
diff --git a/plugins/arma2/arma2.pro b/plugins/arma2/arma2.pro
index 366f8284f..993f488e9 100644
--- a/plugins/arma2/arma2.pro
+++ b/plugins/arma2/arma2.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = arma2
-SOURCES = arma2.cpp
-LIBS += -luser32
+TARGET = arma2
+SOURCES = arma2.cpp
+LIBS += -luser32
diff --git a/plugins/bf1942/bf1942.pro b/plugins/bf1942/bf1942.pro
index e76e8a159..43244e885 100644
--- a/plugins/bf1942/bf1942.pro
+++ b/plugins/bf1942/bf1942.pro
@@ -5,8 +5,8 @@
include(../plugins.pri)
-TARGET = bf1942
-SOURCES = bf1942.cpp
-LIBS += -luser32
+TARGET = bf1942
+SOURCES = bf1942.cpp
+LIBS += -luser32
diff --git a/plugins/bf2/bf2.pro b/plugins/bf2/bf2.pro
index d8bdfb345..5d6f93759 100644
--- a/plugins/bf2/bf2.pro
+++ b/plugins/bf2/bf2.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = bf2
-SOURCES = bf2.cpp
-LIBS += -luser32
+TARGET = bf2
+SOURCES = bf2.cpp
+LIBS += -luser32
diff --git a/plugins/bf2142/bf2142.pro b/plugins/bf2142/bf2142.pro
index c3e1883c8..53bb4bec5 100644
--- a/plugins/bf2142/bf2142.pro
+++ b/plugins/bf2142/bf2142.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = bf2142
-SOURCES = bf2142.cpp
-LIBS += -luser32
+TARGET = bf2142
+SOURCES = bf2142.cpp
+LIBS += -luser32
diff --git a/plugins/bf3/bf3.pro b/plugins/bf3/bf3.pro
index 0ca09a1ed..6e382a44b 100644
--- a/plugins/bf3/bf3.pro
+++ b/plugins/bf3/bf3.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = bf3
-SOURCES = bf3.cpp
-LIBS += -luser32
+TARGET = bf3
+SOURCES = bf3.cpp
+LIBS += -luser32
diff --git a/plugins/bf4/bf4.pro b/plugins/bf4/bf4.pro
index 2cbda3cbd..35c999041 100644
--- a/plugins/bf4/bf4.pro
+++ b/plugins/bf4/bf4.pro
@@ -1,5 +1,5 @@
include(../plugins.pri)
-TARGET = bf4
-SOURCES = bf4.cpp
-LIBS += -luser32
+TARGET = bf4
+SOURCES = bf4.cpp
+LIBS += -luser32
diff --git a/plugins/bf4_x86/bf4_x86.pro b/plugins/bf4_x86/bf4_x86.pro
index 2fe258696..2aefb8ec3 100644
--- a/plugins/bf4_x86/bf4_x86.pro
+++ b/plugins/bf4_x86/bf4_x86.pro
@@ -1,5 +1,5 @@
include(../plugins.pri)
-TARGET = bf4_x86
-SOURCES = bf4_x86.cpp
-LIBS += -luser32
+TARGET = bf4_x86
+SOURCES = bf4_x86.cpp
+LIBS += -luser32
diff --git a/plugins/bfbc2/bfbc2.pro b/plugins/bfbc2/bfbc2.pro
index 88287324e..142c50d7b 100644
--- a/plugins/bfbc2/bfbc2.pro
+++ b/plugins/bfbc2/bfbc2.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = bfbc2
-SOURCES = bfbc2.cpp
-LIBS += -luser32
+TARGET = bfbc2
+SOURCES = bfbc2.cpp
+LIBS += -luser32
diff --git a/plugins/bfheroes/bfheroes.pro b/plugins/bfheroes/bfheroes.pro
index 176d5499e..fa3aa4514 100644
--- a/plugins/bfheroes/bfheroes.pro
+++ b/plugins/bfheroes/bfheroes.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = bfheroes
-SOURCES = bfheroes.cpp
-LIBS += -luser32
+TARGET = bfheroes
+SOURCES = bfheroes.cpp
+LIBS += -luser32
diff --git a/plugins/blacklight/blacklight.pro b/plugins/blacklight/blacklight.pro
index fbd12b9b6..1145aed4d 100644
--- a/plugins/blacklight/blacklight.pro
+++ b/plugins/blacklight/blacklight.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = blacklight
-SOURCES = blacklight.cpp
-LIBS += -luser32
+TARGET = blacklight
+SOURCES = blacklight.cpp
+LIBS += -luser32
diff --git a/plugins/borderlands/borderlands.pro b/plugins/borderlands/borderlands.pro
index 2c556221a..e30a48f0d 100644
--- a/plugins/borderlands/borderlands.pro
+++ b/plugins/borderlands/borderlands.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = borderlands
-SOURCES = borderlands.cpp
-LIBS += -luser32
+TARGET = borderlands
+SOURCES = borderlands.cpp
+LIBS += -luser32
diff --git a/plugins/borderlands2/borderlands2.pro b/plugins/borderlands2/borderlands2.pro
index fdc19a53d..c7b7dde40 100644
--- a/plugins/borderlands2/borderlands2.pro
+++ b/plugins/borderlands2/borderlands2.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = borderlands2
-SOURCES = borderlands2.cpp
-LIBS += -luser32
+TARGET = borderlands2
+SOURCES = borderlands2.cpp
+LIBS += -luser32
diff --git a/plugins/breach/breach.pro b/plugins/breach/breach.pro
index b62585467..876dff1a7 100644
--- a/plugins/breach/breach.pro
+++ b/plugins/breach/breach.pro
@@ -5,7 +5,7 @@
include(../plugins.pri)
-TARGET = breach
-SOURCES = breach.cpp
-LIBS += -luser32
+TARGET = breach
+SOURCES = breach.cpp
+LIBS += -luser32
diff --git a/plugins/cod2/cod2.pro b/plugins/cod2/cod2.pro
index f791be871..2873ef1b5 100644
--- a/plugins/cod2/cod2.pro
+++ b/plugins/cod2/cod2.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = cod2
-SOURCES = cod2.cpp
-LIBS += -luser32
+TARGET = cod2
+SOURCES = cod2.cpp
+LIBS += -luser32
diff --git a/plugins/cod4/cod4.pro b/plugins/cod4/cod4.pro
index 4d1430c3c..33c96b04f 100644
--- a/plugins/cod4/cod4.pro
+++ b/plugins/cod4/cod4.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = cod4
-SOURCES = cod4.cpp
-LIBS += -luser32
+TARGET = cod4
+SOURCES = cod4.cpp
+LIBS += -luser32
diff --git a/plugins/cod5/cod5.pro b/plugins/cod5/cod5.pro
index 570a4bad7..b463d93c8 100644
--- a/plugins/cod5/cod5.pro
+++ b/plugins/cod5/cod5.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = cod5
-SOURCES = cod5.cpp
-LIBS += -luser32
+TARGET = cod5
+SOURCES = cod5.cpp
+LIBS += -luser32
diff --git a/plugins/codmw2/codmw2.pro b/plugins/codmw2/codmw2.pro
index 7b1a3f19b..3d32f0d33 100644
--- a/plugins/codmw2/codmw2.pro
+++ b/plugins/codmw2/codmw2.pro
@@ -5,8 +5,8 @@
include(../plugins.pri)
-TARGET = codmw2
-SOURCES = codmw2.cpp
-LIBS += -luser32
+TARGET = codmw2
+SOURCES = codmw2.cpp
+LIBS += -luser32
diff --git a/plugins/codmw2so/codmw2so.pro b/plugins/codmw2so/codmw2so.pro
index c28e58f84..721fc4b5e 100644
--- a/plugins/codmw2so/codmw2so.pro
+++ b/plugins/codmw2so/codmw2so.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = codmw2so
-SOURCES = codmw2so.cpp
-LIBS += -luser32
+TARGET = codmw2so
+SOURCES = codmw2so.cpp
+LIBS += -luser32
diff --git a/plugins/cs/cs.pro b/plugins/cs/cs.pro
index 1b3c1a4c3..ef3a6c0a7 100644
--- a/plugins/cs/cs.pro
+++ b/plugins/cs/cs.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = cs
-SOURCES = cs.cpp
-LIBS += -luser32
+TARGET = cs
+SOURCES = cs.cpp
+LIBS += -luser32
diff --git a/plugins/css/css.pro b/plugins/css/css.pro
index df96be34d..ac3a33a79 100644
--- a/plugins/css/css.pro
+++ b/plugins/css/css.pro
@@ -5,7 +5,7 @@
include(../plugins.pri)
-DEFINES += "NULL_DESC=\"L\\\"CounterStrike : Source (Retracted, now using link)\\\"\""
-TARGET = css
-SOURCES = ../null_plugin.cpp
-LIBS += -luser32
+DEFINES += "NULL_DESC=\"L\\\"CounterStrike : Source (Retracted, now using link)\\\"\""
+TARGET = css
+SOURCES = ../null_plugin.cpp
+LIBS += -luser32
diff --git a/plugins/dods/dods.pro b/plugins/dods/dods.pro
index fae717686..6a7df7a5e 100644
--- a/plugins/dods/dods.pro
+++ b/plugins/dods/dods.pro
@@ -5,7 +5,7 @@
include(../plugins.pri)
-DEFINES += "NULL_DESC=\"L\\\"Day of Defeat : Source (Retracted, now using link)\\\"\""
-TARGET = dods
-SOURCES = ../null_plugin.cpp
-LIBS += -luser32
+DEFINES += "NULL_DESC=\"L\\\"Day of Defeat : Source (Retracted, now using link)\\\"\""
+TARGET = dods
+SOURCES = ../null_plugin.cpp
+LIBS += -luser32
diff --git a/plugins/dys/dys.pro b/plugins/dys/dys.pro
index 04b789987..cce61c5d6 100644
--- a/plugins/dys/dys.pro
+++ b/plugins/dys/dys.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = dys
-SOURCES = dys.cpp
-LIBS += -luser32
+TARGET = dys
+SOURCES = dys.cpp
+LIBS += -luser32
diff --git a/plugins/etqw/etqw.pro b/plugins/etqw/etqw.pro
index bb842fb12..539d790b9 100644
--- a/plugins/etqw/etqw.pro
+++ b/plugins/etqw/etqw.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = etqw
-SOURCES = etqw.cpp
-LIBS += -luser32
+TARGET = etqw
+SOURCES = etqw.cpp
+LIBS += -luser32
diff --git a/plugins/ffxiv/ffxiv.pro b/plugins/ffxiv/ffxiv.pro
index 5ccc16e0a..bfdeaee71 100755
--- a/plugins/ffxiv/ffxiv.pro
+++ b/plugins/ffxiv/ffxiv.pro
@@ -5,7 +5,7 @@
include(../plugins.pri)
-TARGET = ffxiv
-SOURCES = ffxiv.cpp
+TARGET = ffxiv
+SOURCES = ffxiv.cpp
-win32:LIBS += -luser32
+win32:LIBS += -luser32
diff --git a/plugins/ffxiv_x64/ffxiv_x64.pro b/plugins/ffxiv_x64/ffxiv_x64.pro
index d775e4165..51ef13703 100755
--- a/plugins/ffxiv_x64/ffxiv_x64.pro
+++ b/plugins/ffxiv_x64/ffxiv_x64.pro
@@ -5,8 +5,8 @@
include(../plugins.pri)
-TARGET = ffxiv_x64
-SOURCES = ../ffxiv/ffxiv.cpp
+TARGET = ffxiv_x64
+SOURCES = ../ffxiv/ffxiv.cpp
DEFINES *= FFXIV_USE_x64
-win32:LIBS += -luser32
+win32:LIBS += -luser32
diff --git a/plugins/gmod/gmod.pro b/plugins/gmod/gmod.pro
index b9af031b6..0e2f2daf7 100644
--- a/plugins/gmod/gmod.pro
+++ b/plugins/gmod/gmod.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = gmod
-SOURCES = gmod.cpp
-LIBS += -luser32
+TARGET = gmod
+SOURCES = gmod.cpp
+LIBS += -luser32
diff --git a/plugins/gtaiv/gtaiv.pro b/plugins/gtaiv/gtaiv.pro
index 7cd54c6c1..63c3b9ffe 100644
--- a/plugins/gtaiv/gtaiv.pro
+++ b/plugins/gtaiv/gtaiv.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = gtaiv
-SOURCES = gtaiv.cpp
-LIBS += -luser32
+TARGET = gtaiv
+SOURCES = gtaiv.cpp
+LIBS += -luser32
diff --git a/plugins/gtav/gtav.pro b/plugins/gtav/gtav.pro
index 9e6a389ec..5c2f30e9c 100644
--- a/plugins/gtav/gtav.pro
+++ b/plugins/gtav/gtav.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = gtav
-SOURCES = gtav.cpp
-LIBS += -luser32
+TARGET = gtav
+SOURCES = gtav.cpp
+LIBS += -luser32
diff --git a/plugins/gw/gw.pro b/plugins/gw/gw.pro
index 1067571c2..79044e4a8 100644
--- a/plugins/gw/gw.pro
+++ b/plugins/gw/gw.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = gw
-SOURCES = gw.cpp
-LIBS += -luser32
+TARGET = gw
+SOURCES = gw.cpp
+LIBS += -luser32
diff --git a/plugins/hl2dm/hl2dm.pro b/plugins/hl2dm/hl2dm.pro
index 258a5e1e7..6e7a45888 100644
--- a/plugins/hl2dm/hl2dm.pro
+++ b/plugins/hl2dm/hl2dm.pro
@@ -5,7 +5,7 @@
include(../plugins.pri)
-DEFINES += "NULL_DESC=\"L\\\"Half Life 2 Death Match (Retracted, now using link)\\\"\""
-TARGET = hl2dm
-SOURCES = ../null_plugin.cpp
-LIBS += -luser32
+DEFINES += "NULL_DESC=\"L\\\"Half Life 2 Death Match (Retracted, now using link)\\\"\""
+TARGET = hl2dm
+SOURCES = ../null_plugin.cpp
+LIBS += -luser32
diff --git a/plugins/insurgency/insurgency.pro b/plugins/insurgency/insurgency.pro
index 11ff032de..7f3074f20 100644
--- a/plugins/insurgency/insurgency.pro
+++ b/plugins/insurgency/insurgency.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = insurgency
-SOURCES = insurgency.cpp
-LIBS += -luser32
+TARGET = insurgency
+SOURCES = insurgency.cpp
+LIBS += -luser32
diff --git a/plugins/jc2/jc2.pro b/plugins/jc2/jc2.pro
index d555dda6d..59a687134 100755
--- a/plugins/jc2/jc2.pro
+++ b/plugins/jc2/jc2.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = jc2
-SOURCES = jc2.cpp
-LIBS += -luser32
+TARGET = jc2
+SOURCES = jc2.cpp
+LIBS += -luser32
diff --git a/plugins/l4d/l4d.pro b/plugins/l4d/l4d.pro
index 96d78f1a6..4b291bbee 100644
--- a/plugins/l4d/l4d.pro
+++ b/plugins/l4d/l4d.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = l4d
-SOURCES = l4d.cpp
-LIBS += -luser32
+TARGET = l4d
+SOURCES = l4d.cpp
+LIBS += -luser32
diff --git a/plugins/link/link.pro b/plugins/link/link.pro
index 301f736ad..0f0be2c88 100644
--- a/plugins/link/link.pro
+++ b/plugins/link/link.pro
@@ -5,15 +5,15 @@
include(../plugins.pri)
-TARGET = link
+TARGET = link
win32 {
- SOURCES = link.cpp
- LIBS += -luser32
+ SOURCES = link.cpp
+ LIBS += -luser32
}
unix {
- SOURCES = link-posix.cpp
+ SOURCES = link-posix.cpp
linux* {
LIBS += -lrt
diff --git a/plugins/lol/lol.pro b/plugins/lol/lol.pro
index a330782de..12d5bd4ce 100644
--- a/plugins/lol/lol.pro
+++ b/plugins/lol/lol.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = lol
-SOURCES = lol.cpp
-LIBS += -luser32
+TARGET = lol
+SOURCES = lol.cpp
+LIBS += -luser32
diff --git a/plugins/lotro/lotro.pro b/plugins/lotro/lotro.pro
index d505b8d47..e47918ea2 100644
--- a/plugins/lotro/lotro.pro
+++ b/plugins/lotro/lotro.pro
@@ -5,7 +5,7 @@
include(../plugins.pri)
-TARGET = lotro
-SOURCES = lotro.cpp
-LIBS += -luser32
-CONFIG += qt
+TARGET = lotro
+SOURCES = lotro.cpp
+LIBS += -luser32
+CONFIG += qt
diff --git a/plugins/ql/ql.pro b/plugins/ql/ql.pro
index 9f39f7494..d96ce5d3c 100644
--- a/plugins/ql/ql.pro
+++ b/plugins/ql/ql.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = ql
-SOURCES = ql.cpp
-LIBS += -luser32
+TARGET = ql
+SOURCES = ql.cpp
+LIBS += -luser32
diff --git a/plugins/sr/sr.pro b/plugins/sr/sr.pro
index 0c4ada596..5ab698dbb 100644
--- a/plugins/sr/sr.pro
+++ b/plugins/sr/sr.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = sr
-SOURCES = sr.cpp
-LIBS += -luser32
+TARGET = sr
+SOURCES = sr.cpp
+LIBS += -luser32
diff --git a/plugins/sto/sto.pro b/plugins/sto/sto.pro
index fb4d7d211..a75547eaa 100644
--- a/plugins/sto/sto.pro
+++ b/plugins/sto/sto.pro
@@ -5,7 +5,7 @@
include(../plugins.pri)
-DEFINES += "NULL_DESC=\"L\\\"Star Trek Online (Retracted due to lack of maintenance)\\\"\""
-TARGET = sto
-SOURCES = ../null_plugin.cpp
-LIBS += -luser32
+DEFINES += "NULL_DESC=\"L\\\"Star Trek Online (Retracted due to lack of maintenance)\\\"\""
+TARGET = sto
+SOURCES = ../null_plugin.cpp
+LIBS += -luser32
diff --git a/plugins/tf2/tf2.pro b/plugins/tf2/tf2.pro
index 14fbfc384..a5c1b1ed6 100644
--- a/plugins/tf2/tf2.pro
+++ b/plugins/tf2/tf2.pro
@@ -5,7 +5,7 @@
include(../plugins.pri)
-DEFINES += "NULL_DESC=\"L\\\"Team Fortress 2 (Retracted, now using link)\\\"\""
-TARGET = tf2
-SOURCES = ../null_plugin.cpp
-LIBS += -luser32
+DEFINES += "NULL_DESC=\"L\\\"Team Fortress 2 (Retracted, now using link)\\\"\""
+TARGET = tf2
+SOURCES = ../null_plugin.cpp
+LIBS += -luser32
diff --git a/plugins/ut2004/ut2004.pro b/plugins/ut2004/ut2004.pro
index 50e81706f..ef86bada8 100644
--- a/plugins/ut2004/ut2004.pro
+++ b/plugins/ut2004/ut2004.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = ut2004
-SOURCES = ut2004.cpp
-LIBS += -luser32
+TARGET = ut2004
+SOURCES = ut2004.cpp
+LIBS += -luser32
diff --git a/plugins/ut3/ut3.pro b/plugins/ut3/ut3.pro
index 1dbf9443a..c8431fbc1 100644
--- a/plugins/ut3/ut3.pro
+++ b/plugins/ut3/ut3.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = ut3
-SOURCES = ut3.cpp
-LIBS += -luser32
+TARGET = ut3
+SOURCES = ut3.cpp
+LIBS += -luser32
diff --git a/plugins/ut99/ut99.pro b/plugins/ut99/ut99.pro
index 6a5f56f89..e0a5284f1 100644
--- a/plugins/ut99/ut99.pro
+++ b/plugins/ut99/ut99.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = ut99
-SOURCES = ut99.cpp
-LIBS += -luser32
+TARGET = ut99
+SOURCES = ut99.cpp
+LIBS += -luser32
diff --git a/plugins/wolfet/wolfet.pro b/plugins/wolfet/wolfet.pro
index 48ac464c5..3e8c660a1 100644
--- a/plugins/wolfet/wolfet.pro
+++ b/plugins/wolfet/wolfet.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = wolfet
-SOURCES = wolfet.cpp
-LIBS += -luser32
+TARGET = wolfet
+SOURCES = wolfet.cpp
+LIBS += -luser32
diff --git a/plugins/wow/wow.pro b/plugins/wow/wow.pro
index 17e41b7fd..9e4a21154 100644
--- a/plugins/wow/wow.pro
+++ b/plugins/wow/wow.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = wow
-SOURCES = wow.cpp
-LIBS += -luser32
+TARGET = wow
+SOURCES = wow.cpp
+LIBS += -luser32
diff --git a/plugins/wow_x64/wow_x64.pro b/plugins/wow_x64/wow_x64.pro
index c77e6f8df..b38402303 100644
--- a/plugins/wow_x64/wow_x64.pro
+++ b/plugins/wow_x64/wow_x64.pro
@@ -5,6 +5,6 @@
include(../plugins.pri)
-TARGET = wow_x64
-SOURCES = wow_x64.cpp
-LIBS += -luser32
+TARGET = wow_x64
+SOURCES = wow_x64.cpp
+LIBS += -luser32
diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
index 14094ec05..11e408036 100644
--- a/src/mumble/mumble.pro
+++ b/src/mumble/mumble.pro
@@ -7,9 +7,9 @@ include(../mumble.pri)
include(../../qmake/python.pri)
include(../../qmake/lrelease.pri)
-DEFINES *= MUMBLE
-TEMPLATE = app
-TARGET = mumble
+DEFINES *= MUMBLE
+TEMPLATE = app
+TARGET = mumble
!CONFIG(qt4-legacy-compat) {
CONFIG += no-qt4-legacy-compat
@@ -61,7 +61,7 @@ CONFIG(static) {
CONFIG += static_qt_plugins
}
-QT *= network sql xml svg
+QT *= network sql xml svg
isEqual(QT_MAJOR_VERSION, 5) {
QT *= widgets
@@ -214,8 +214,8 @@ CONFIG(qtspeech) {
SOURCES *= TextToSpeech.cpp
}
-DIST *= ../../icons/mumble.ico ../../icons/mumble.xpm murmur_pch.h mumble.plist
-RESOURCES *= mumble.qrc mumble_translations.qrc ../../themes/MumbleTheme.qrc
+DIST *= ../../icons/mumble.ico ../../icons/mumble.xpm murmur_pch.h mumble.plist
+RESOURCES *= mumble.qrc mumble_translations.qrc ../../themes/MumbleTheme.qrc
# Add the various mumble_flags_XX.qrc files to RESOURCES...
include(flags/mumble_flags.pri)
@@ -279,20 +279,20 @@ CONFIG(static) {
}
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
}
CONFIG(no-crash-report) {
- DEFINES *= NO_CRASH_REPORT
+ DEFINES *= NO_CRASH_REPORT
} else:unix:!macx {
- DEFINES *= NO_CRASH_REPORT
+ DEFINES *= NO_CRASH_REPORT
} else {
- HEADERS *= CrashReporter.h
- SOURCES *= CrashReporter.cpp
+ HEADERS *= CrashReporter.h
+ SOURCES *= CrashReporter.cpp
}
CONFIG(no-xinput2) {
- DEFINES *= NO_XINPUT2
+ DEFINES *= NO_XINPUT2
}
CONFIG(no-bundled-speex) {
@@ -301,8 +301,8 @@ CONFIG(no-bundled-speex) {
}
!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
+ INCLUDEPATH *= ../../3rdparty/speex-src/include ../../3rdparty/speex-src/libspeex ../../3rdparty/speex-build ../../3rdparty/speexdsp-src/include ../../3rdparty/speexdsp-src/libspeexdsp
+ LIBS *= -lspeex
}
CONFIG(sbcelt) {
@@ -313,10 +313,10 @@ CONFIG(sbcelt) {
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
}
CONFIG(no-bundled-celt) {
- INCLUDEPATH *= /usr/include/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"
@@ -332,7 +332,7 @@ CONFIG(sbcelt) {
}
!win32:!macx:!CONFIG(no-dbus) {
- CONFIG *= dbus
+ CONFIG *= dbus
}
!contains(UNAME, FreeBSD):!CONFIG(no-g15) {
CONFIG *= g15
@@ -373,31 +373,31 @@ win32 {
} else {
RC_FILE = mumble.rc
}
- HEADERS *= GlobalShortcut_win.h Overlay_win.h TaskList.h UserLockFile.h
- SOURCES *= GlobalShortcut_win.cpp Overlay_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
+ HEADERS *= GlobalShortcut_win.h Overlay_win.h TaskList.h UserLockFile.h
+ SOURCES *= GlobalShortcut_win.cpp Overlay_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(qtspeech) {
SOURCES *= TextToSpeech_win.cpp
}
- LIBS *= -ldxguid -ldinput8 -lsapi -lole32 -lws2_32 -ladvapi32 -lwintrust -ldbghelp -lshell32 -lshlwapi -luser32 -lgdi32 -lpsapi
+ 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
}
- LIBS *= -ldelayimp -delayload:shell32.dll
+ LIBS *= -ldelayimp -delayload:shell32.dll
- DEFINES *= WIN32
+ DEFINES *= WIN32
!CONFIG(no-asio) {
- CONFIG *= asio
+ CONFIG *= asio
}
!CONFIG(no-directsound) {
- CONFIG *= directsound
+ CONFIG *= directsound
}
!CONFIG(no-wasapi) {
- CONFIG *= wasapi
+ CONFIG *= wasapi
}
!CONFIG(no-gkey) {
CONFIG *= gkey
@@ -553,7 +553,7 @@ portaudio {
asio {
DEFINES *= USE_ASIO
HEADERS *= ASIOInput.h
- SOURCES *= ASIOInput.cpp
+ SOURCES *= ASIOInput.cpp
FORMS *= ASIOInput.ui
# If 3rdparty/asio exists, use that...
@@ -606,15 +606,15 @@ speechd {
must_pkgconfig(speech-dispatcher)
} else {
LIBS *= -lspeechd
- INCLUDEPATH *= /usr/include/speech-dispatcher
+ INCLUDEPATH *= /usr/include/speech-dispatcher
}
}
directsound {
DEFINES *= USE_DIRECTSOUND
- HEADERS *= DirectSound.h
- SOURCES *= DirectSound.cpp
- LIBS *= -ldsound
+ HEADERS *= DirectSound.h
+ SOURCES *= DirectSound.cpp
+ LIBS *= -ldsound
win32-g++ {
LIBS *= -lksuser
}
@@ -622,9 +622,9 @@ directsound {
wasapi {
DEFINES *= USE_WASAPI
- HEADERS *= WASAPI.h WASAPINotificationClient.h
- SOURCES *= WASAPI.cpp WASAPINotificationClient.cpp
- LIBS *= -lavrt -delayload:avrt.DLL
+ HEADERS *= WASAPI.h WASAPINotificationClient.h
+ SOURCES *= WASAPI.cpp WASAPINotificationClient.cpp
+ LIBS *= -lavrt -delayload:avrt.DLL
win32-g++ {
LIBS *= -lboost_system-mt
}
diff --git a/src/mumble_exe/mumble_exe.pro b/src/mumble_exe/mumble_exe.pro
index 5e121e7f8..54993504a 100644
--- a/src/mumble_exe/mumble_exe.pro
+++ b/src/mumble_exe/mumble_exe.pro
@@ -47,12 +47,12 @@ win32-msvc* {
CONFIG(debug, debug|release) {
CONFIG += console
DEFINES *= DEBUG
- DESTDIR = ../../debug
+ DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
DEFINES *= NDEBUG
- DESTDIR = ../../release
+ DESTDIR = ../../release
}
include(../../qmake/symbols.pri)
diff --git a/src/mumble_proto/mumble_proto.pro b/src/mumble_proto/mumble_proto.pro
index 5177cc2b3..d5cf928e7 100644
--- a/src/mumble_proto/mumble_proto.pro
+++ b/src/mumble_proto/mumble_proto.pro
@@ -6,7 +6,7 @@
include(../../qmake/compiler.pri)
include(../../qmake/protoc.pri)
-PROTOBUF *= ../Mumble.proto
+PROTOBUF *= ../Mumble.proto
pbh.output = ${QMAKE_FILE_BASE}.pb.h
pbh.depends = ${QMAKE_FILE_BASE}.pb.cc
diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro
index d686a66a7..3624dffa6 100644
--- a/src/murmur/murmur.pro
+++ b/src/murmur/murmur.pro
@@ -7,14 +7,14 @@ include(../mumble.pri)
include(../../qmake/protoc.pri)
DEFINES *= MURMUR
-TEMPLATE =app
-CONFIG *= network
-CONFIG -= gui
+TEMPLATE =app
+CONFIG *= network
+CONFIG -= gui
QT *= network sql xml
QT -= gui
TARGET = murmur
-DBFILE = murmur.db
-LANGUAGE = C++
+DBFILE = murmur.db
+LANGUAGE = C++
FORMS =
HEADERS *= Server.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
@@ -41,7 +41,7 @@ win32 {
isEqual(QT_MAJOR_VERSION, 5) {
QT *= widgets
}
- RESOURCES *= murmur.qrc
+ RESOURCES *= murmur.qrc
SOURCES *= Tray.cpp About.cpp
HEADERS *= Tray.h About.h
LIBS *= -luser32
diff --git a/src/tests/Hash.pro b/src/tests/Hash.pro
index 0235a93d4..c21c91ece 100644
--- a/src/tests/Hash.pro
+++ b/src/tests/Hash.pro
@@ -1,6 +1,6 @@
-TEMPLATE =app
-CONFIG += qt thread warn_on qtestlib debug
-LANGUAGE = C++
+TEMPLATE =app
+CONFIG += qt thread warn_on qtestlib debug
+LANGUAGE = C++
TARGET = Hash
SOURCES = Hash.cpp Timer.cpp
HEADERS = Timer.h
diff --git a/src/tests/Resample.pro b/src/tests/Resample.pro
index ccf14e55c..36f753ffe 100644
--- a/src/tests/Resample.pro
+++ b/src/tests/Resample.pro
@@ -7,25 +7,25 @@ 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
+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"
+ 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
+ DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR
- DESTDIR = ../../release
+ DESTDIR = ../../release
}
diff --git a/src/tests/TestLink.pro b/src/tests/TestLink.pro
index 7ac2e98e8..f4101d4c2 100644
--- a/src/tests/TestLink.pro
+++ b/src/tests/TestLink.pro
@@ -1,7 +1,7 @@
-TEMPLATE =app
-CONFIG += qt thread warn_on debug console
+TEMPLATE =app
+CONFIG += qt thread warn_on debug console
CONFIG -= app_bundle
-LANGUAGE = C++
+LANGUAGE = C++
TARGET = TestLink
SOURCES = TestLink.cpp
INCLUDEPATH += ../../plugins