diff options
| -rw-r--r-- | compiler.pri | 12 | ||||
| -rw-r--r-- | overlay/overlay.pro | 5 | ||||
| -rw-r--r-- | src/mumble.pri | 2 | ||||
| -rw-r--r-- | src/mumble/mumble.pro | 4 | ||||
| -rw-r--r-- | src/mumble11x/mumble11x.pro | 4 |
5 files changed, 15 insertions, 12 deletions
diff --git a/compiler.pri b/compiler.pri index 77b63af30..60a7e8fca 100644 --- a/compiler.pri +++ b/compiler.pri @@ -1,7 +1,7 @@ CONFIG *= warn_on win32 { - INCLUDEPATH *= /dev/WinSDK/include /dev/dxsdk/Include /dev/Boost/include/boost-1_39 + INCLUDEPATH *= /dev/Boost/include/boost-1_39 CONFIG(intelcpp) { DEFINES *= RESTRICT=restrict DEFINES *= VAR_ARRAYS @@ -40,8 +40,14 @@ win32 { QMAKE_LFLAGS *= -fixed:no -debug } CONFIG(debug, debug|release) { - INCLUDEPATH *= /dev/vld/include - LIBPATH *= /dev/vld/lib + exists($$(VLD_DIR)) { + VLD_DIR = $$(VLD_DIR) + } + else { + VLD_DIR = /dev/vld + } + INCLUDEPATH *= "$$VLD_DIR/include" + LIBPATH *= "$$VLD_DIR/lib" DEFINES *= USE_VLD } } else { diff --git a/overlay/overlay.pro b/overlay/overlay.pro index a1f2bf1e0..eee725dc9 100644 --- a/overlay/overlay.pro +++ b/overlay/overlay.pro @@ -16,10 +16,7 @@ QMAKE_CXXFLAGS_DEBUG -= -MDd QMAKE_CXXFLAGS_RELEASE *= -MT QMAKE_CXXFLAGS_DEBUG *= -MTd -LIBS *= -ldxguid -luuid -lole32 -luser32 -LIBPATH *= /dev/WinSDK/Lib/i386 /dev/dxsdk/Lib/x86 - -INCLUDEPATH *= /dev/WinSDK/Include /dev/dxsdk/Include /dev/Boost/include/boost-1_35 +LIBS *= -l"$$(DXSDK_DIR)Lib/x86/dxguid" -luuid -lole32 -luser32 CONFIG(release, debug|release) { DESTDIR = ../release diff --git a/src/mumble.pri b/src/mumble.pri index 01b5cba7b..2430dce86 100644 --- a/src/mumble.pri +++ b/src/mumble.pri @@ -16,7 +16,7 @@ pb.input = PROTOBUF pb.CONFIG *= no_link win32 { - INCLUDEPATH *= /dev/protobuf-2.2.0/vsprojects/include + INCLUDEPATH *= /dev/protobuf-2.2.0/vsprojects/include /dev/protobuf-2.2.0/src CONFIG(debug, debug|release) { LIBPATH *= /dev/protobuf-2.2.0/vsprojects/Debug } else { diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro index dfc345747..97ca61a9d 100644 --- a/src/mumble/mumble.pro +++ b/src/mumble/mumble.pro @@ -65,9 +65,9 @@ win32 { RC_FILE = mumble.rc HEADERS *= GlobalShortcut_win.h SOURCES *= GlobalShortcut_win.cpp TextToSpeech_win.cpp Overlay_win.cpp os_win.cpp - LIBS *= -ldxguid -ldinput8 -lsapi -lole32 -lws2_32 -ladvapi32 -lwintrust -ldbghelp -llibsndfile-1 + LIBS *= -l"$$(DXSDK_DIR)Lib/x86/dxguid" -l"$$(DXSDK_DIR)Lib/x86/dinput8" -lsapi -lole32 -lws2_32 -ladvapi32 -lwintrust -ldbghelp -llibsndfile-1 - LIBPATH *= $$(DXSDK_DIR)/Lib/x86 /dev/OpenSSL/lib /dev/libsndfile + LIBPATH *= /dev/OpenSSL/lib /dev/libsndfile DEFINES *= WIN32 INCLUDEPATH *= /dev/OpenSSL/include /dev/libsndfile/include !CONFIG(no-asio) { diff --git a/src/mumble11x/mumble11x.pro b/src/mumble11x/mumble11x.pro index 2ac455c8d..5abf59812 100644 --- a/src/mumble11x/mumble11x.pro +++ b/src/mumble11x/mumble11x.pro @@ -61,10 +61,10 @@ win32 { RC_FILE = mumble.rc HEADERS *= GlobalShortcut_win.h SOURCES *= GlobalShortcut_win.cpp TextToSpeech_win.cpp Overlay_win.cpp os_win.cpp - LIBS *= -ldxguid -ldinput8 -lsapi -lole32 -lws2_32 -llibeay32 -ladvapi32 -llibogg + LIBS *= -l"$$(DXSDK_DIR)Lib/x86/dxguid" -l"$$(DXSDK_DIR)Lib/x86/dinput8" -lsapi -lole32 -lws2_32 -llibeay32 -ladvapi32 -llibogg LIBS *= -ldelayimp -lQwave -delayload:Qwave.DLL - LIBPATH *= /dev/WinSDK/Lib/i386 /dev/dxsdk/Lib/x86 /dev/OpenSSL/lib /dev/libogg/lib + LIBPATH *= /dev/OpenSSL/lib /dev/libogg/lib DEFINES *= WIN32 INCLUDEPATH *= /dev/OpenSSL/include /dev/libogg/include !CONFIG(no-asio) { |