From 88cfcf7e26f9a3cad58c7bd34fc1f9c1e94ef4bc Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Fri, 11 Jul 2014 02:41:13 +1000
Subject: [PATCH] Qt: Don't detect executable by name (in case we change it).

---
 Qt/Core.pro                | 1 +
 Qt/GPU.pro                 | 4 ++--
 Qt/Platform/Windows.pri    | 2 +-
 Qt/Platform/android.pri    | 2 +-
 Qt/Platform/blackberry.pri | 2 +-
 Qt/Platform/linux.pri      | 2 +-
 Qt/Platform/macosx.pri     | 2 +-
 Qt/Platform/maemo.pri      | 2 +-
 Qt/Platform/symbian.pri    | 2 +-
 Qt/Settings.pri            | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Qt/Core.pro b/Qt/Core.pro
index a916c6c41c..154a942473 100644
--- a/Qt/Core.pro
+++ b/Qt/Core.pro
@@ -6,6 +6,7 @@ CONFIG += staticlib
 include(Settings.pri)
 
 INCLUDEPATH += $$P/ $$P/native $$P/Core/MIPS $$P/ext/xbrz
+!contains(DEFINES, USING_GLES2): INCLUDEPATH += $$P/native/ext/glew
 
 arm {
 	SOURCES += $$P/Core/MIPS/ARM/*.cpp \ #CoreARM
diff --git a/Qt/GPU.pro b/Qt/GPU.pro
index 39a9cf6c36..4ba5580252 100644
--- a/Qt/GPU.pro
+++ b/Qt/GPU.pro
@@ -21,7 +21,7 @@ win32 {
 	INCLUDEPATH += $$P/dx9sdk/Include
 }
 
-SOURCES += 	$$P/GPU/GeDisasm.cpp \ # GPU
+SOURCES += $$P/GPU/GeDisasm.cpp \ # GPU
 	$$P/GPU/GPUCommon.cpp \
 	$$P/GPU/GPUState.cpp \
 	$$P/GPU/Math3D.cpp \
@@ -55,7 +55,7 @@ armv7: SOURCES += $$P/GPU/Common/TextureDecoderNEON.cpp
 arm: SOURCES += $$P/GPU/GLES/VertexDecoderArm.cpp
 else: SOURCES += $$P/GPU/GLES/VertexDecoderX86.cpp
 
-HEADERS += 	$$P/GPU/GLES/*.h \
+HEADERS += $$P/GPU/GLES/*.h \
 	$$P/GPU/Software/*.h \
 	$$P/GPU/Debugger/*.h \
 	$$P/GPU/Common/*.h \
diff --git a/Qt/Platform/Windows.pri b/Qt/Platform/Windows.pri
index c7b0df5ac2..5ef7c00fff 100644
--- a/Qt/Platform/Windows.pri
+++ b/Qt/Platform/Windows.pri
@@ -2,7 +2,7 @@ PRECOMPILED_HEADER = $$P/Windows/stdafx.h
 PRECOMPILED_SOURCE = $$P/Windows/stdafx.cpp
 INCLUDEPATH += $$P
 
-equals(TARGET, PPSSPPQt) {
+!contains(CONFIG, staticlib) {
 	# Executable
 	# Use a fixed base-address under windows
 	QMAKE_LFLAGS += /FIXED /BASE:"0x00400000" /DYNAMICBASE:NO
diff --git a/Qt/Platform/android.pri b/Qt/Platform/android.pri
index 55b25acc1c..e23ae0e38c 100644
--- a/Qt/Platform/android.pri
+++ b/Qt/Platform/android.pri
@@ -1,7 +1,7 @@
 DEFINES += ANDROID
 INCLUDEPATH += $$P/native/ext/libzip
 
-equals(TARGET, PPSSPPQt) {
+!contains(CONFIG, staticlib) {
 	# Packaging
 	ANDROID_PACKAGE_SOURCE_DIR = $$P/android
 }
diff --git a/Qt/Platform/blackberry.pri b/Qt/Platform/blackberry.pri
index 22c2829d5b..2f843be5f0 100644
--- a/Qt/Platform/blackberry.pri
+++ b/Qt/Platform/blackberry.pri
@@ -1,7 +1,7 @@
 # Use a mkspec that allows g++
 DEFINES += BLACKBERRY "_QNX_SOURCE=1" "_C99=1"
 
-equals(TARGET, PPSSPPQt) {
+!contains(CONFIG, staticlib) {
 	# Executable
 	LIBS += -lscreen -liconv
 }
diff --git a/Qt/Platform/linux.pri b/Qt/Platform/linux.pri
index 564313bc0c..b1fa9d26fd 100644
--- a/Qt/Platform/linux.pri
+++ b/Qt/Platform/linux.pri
@@ -1,6 +1,6 @@
 
 
-equals(TARGET, PPSSPPQt) {
+!contains(CONFIG, staticlib) {
 	# Executable
 	LIBS += -ldl -lrt
 
diff --git a/Qt/Platform/macosx.pri b/Qt/Platform/macosx.pri
index 86fc3f6648..428a11e2f2 100644
--- a/Qt/Platform/macosx.pri
+++ b/Qt/Platform/macosx.pri
@@ -1,6 +1,6 @@
 QMAKE_MAC_SDK=macosx10.9
 
-equals(TARGET, PPSSPPQt) {
+!contains(CONFIG, staticlib) {
 	# Executable
 	LIBS += -liconv
 }
diff --git a/Qt/Platform/maemo.pri b/Qt/Platform/maemo.pri
index 79210f198a..acb445458f 100644
--- a/Qt/Platform/maemo.pri
+++ b/Qt/Platform/maemo.pri
@@ -1,7 +1,7 @@
 DEFINES += MAEMO __GL_EXPORTS
 contains(MEEGO_EDITION,harmattan): DEFINES += "_SYS_UCONTEXT_H=1"
 
-equals(TARGET, PPSSPPQt) {
+!contains(CONFIG, staticlib) {
 	# Packaging
 	target.path = /opt/PPSSPP/bin
 	desktopfile.files = PPSSPP.desktop
diff --git a/Qt/Platform/symbian.pri b/Qt/Platform/symbian.pri
index e78e83b122..a71fd695ea 100644
--- a/Qt/Platform/symbian.pri
+++ b/Qt/Platform/symbian.pri
@@ -2,7 +2,7 @@ INCLUDEPATH += $$EPOCROOT/epoc32/include/stdapis
 DEFINES += "BOOST_COMPILER_CONFIG=\"$$EPOCROOT/epoc32/include/stdapis/boost/mpl/aux_/config/gcc.hpp\"" SYMBIAN_OGLES_DLL_EXPORTS
 QMAKE_CXXFLAGS += -marm -Wno-parentheses -Wno-comment -Wno-unused-local-typedefs
 
-contains(TARGET, PPSSPPQt) {
+!contains(CONFIG, staticlib) {
 	# Executable
 	LIBS += -lremconcoreapi -lremconinterfacebase
 
diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index 32b9645f0c..55e0609fce 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -19,7 +19,7 @@ include(Platform/OSDetection.pri)
 # OS dependent paths
 INCLUDEPATH += $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/include
 
-equals(TARGET, PPSSPPQt) {
+!contains(CONFIG, staticlib) {
 	QMAKE_LIBDIR += $$CONFIG_DIR $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/lib/
 	contains(DEFINES, USE_FFMPEG): LIBS += -lavformat -lavcodec -lavutil -lswresample -lswscale
 	equals(PLATFORM_NAME, "linux"):arm|android: LIBS += -lEGL