diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 2bbe7b85dd..4f018883c9 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -1,75 +1,76 @@
-TARGET = PPSSPPQt
-QT += core gui opengl
-
-include(Settings.pri)
-linux {
-	CONFIG += mobility
-	MOBILITY += multimedia
-}
-else {
-	QT += multimedia
-}
-
-# Libs
-symbian: LIBS += -lCore.lib -lCommon.lib -lNative.lib -lcone -leikcore -lavkon -lezlib
-
-blackberry: LIBS += -L. -lCore -lCommon -lNative -lscreen -lsocket -lstdc++
-
-win32: LIBS += -L. -lCore -lCommon -lNative -lwinmm -lws2_32 -lkernel32 -luser32 -lgdi32 -lshell32 -lcomctl32 -ldsound -lxinput
-
-linux: LIBS += -L. -lCore -lCommon -lNative
-
-# Main
-SOURCES += ../native/base/QtMain.cpp
-HEADERS += ../native/base/QtMain.h
-
-# Native
-SOURCES += ../android/jni/EmuScreen.cpp \
-	../android/jni/MenuScreens.cpp \
-	../android/jni/GamepadEmu.cpp \
-	../android/jni/UIShader.cpp \
-	../android/jni/ui_atlas.cpp
-
-INCLUDEPATH += .. ../Common ../native
-
-# Temporarily only use new UI for Linux desktop
-linux:!mobile_platform {
-	SOURCES += mainwindow.cpp \
-		debugger_disasm.cpp \
-		EmuThread.cpp\
-		QtHost.cpp \
-		qtemugl.cpp \
-		ctrldisasmview.cpp \
-		ctrlregisterlist.cpp \
-		controls.cpp
-	HEADERS += mainwindow.h \
-		debugger_disasm.h \
-		EmuThread.h \
-		QtHost.h \
-		qtemugl.h \
-		ctrldisasmview.h \
-		ctrlregisterlist.h \
-		controls.h
-} else {
-	SOURCES += ../android/jni/NativeApp.cpp
-}
-
-# Packaging
-symbian {
-	vendorinfo = "%{\"Qtness\"}" ":\"Qtness\""
-	packageheader = "$${LITERAL_HASH}{\"PPSSPP\"}, (0xE0095B1D), 0, 6, 1, TYPE=SA"
-	deployinfo.pkg_prerules = packageheader vendorinfo
-	assets.sources = ../android/assets/ui_atlas.zim ../assets/ppge_atlas.zim
-	assets.path = E:/PPSSPP
-	DEPLOYMENT += deployinfo assets
-	ICON = ../assets/icon.svg
-# 268MB maximum
-	TARGET.EPOCHEAPSIZE = 0x40000 0x10000000
-	TARGET.EPOCSTACKSIZE = 0x10000
-}
-
-linux:!mobile_platform {
-	FORMS += mainwindow.ui \
-	debugger_disasm.ui \
-	controls.ui
-}
+TARGET = PPSSPPQt
+QT += core gui opengl
+
+include(Settings.pri)
+linux {
+	CONFIG += mobility
+	MOBILITY += multimedia
+}
+else {
+	QT += multimedia
+}
+
+# Libs
+symbian: LIBS += -lCore.lib -lCommon.lib -lNative.lib -lcone -leikcore -lavkon -lezlib
+
+blackberry: LIBS += -L. -lCore -lCommon -lNative -lscreen -lsocket -lstdc++
+
+win32: LIBS += -L. -lCore -lCommon -lNative -lwinmm -lws2_32 -lkernel32 -luser32 -lgdi32 -lshell32 -lcomctl32 -ldsound -lxinput
+
+linux: LIBS += -L. -lCore -lCommon -lNative
+linux: PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a
+
+# Main
+SOURCES += ../native/base/QtMain.cpp
+HEADERS += ../native/base/QtMain.h
+
+# Native
+SOURCES += ../android/jni/EmuScreen.cpp \
+	../android/jni/MenuScreens.cpp \
+	../android/jni/GamepadEmu.cpp \
+	../android/jni/UIShader.cpp \
+	../android/jni/ui_atlas.cpp
+
+INCLUDEPATH += .. ../Common ../native
+
+# Temporarily only use new UI for Linux desktop
+linux:!mobile_platform {
+	SOURCES += mainwindow.cpp \
+		debugger_disasm.cpp \
+		EmuThread.cpp\
+		QtHost.cpp \
+		qtemugl.cpp \
+		ctrldisasmview.cpp \
+		ctrlregisterlist.cpp \
+		controls.cpp
+	HEADERS += mainwindow.h \
+		debugger_disasm.h \
+		EmuThread.h \
+		QtHost.h \
+		qtemugl.h \
+		ctrldisasmview.h \
+		ctrlregisterlist.h \
+		controls.h
+} else {
+	SOURCES += ../android/jni/NativeApp.cpp
+}
+
+# Packaging
+symbian {
+	vendorinfo = "%{\"Qtness\"}" ":\"Qtness\""
+	packageheader = "$${LITERAL_HASH}{\"PPSSPP\"}, (0xE0095B1D), 0, 6, 1, TYPE=SA"
+	deployinfo.pkg_prerules = packageheader vendorinfo
+	assets.sources = ../android/assets/ui_atlas.zim ../assets/ppge_atlas.zim
+	assets.path = E:/PPSSPP
+	DEPLOYMENT += deployinfo assets
+	ICON = ../assets/icon.svg
+# 268MB maximum
+	TARGET.EPOCHEAPSIZE = 0x40000 0x10000000
+	TARGET.EPOCSTACKSIZE = 0x10000
+}
+
+linux:!mobile_platform {
+	FORMS += mainwindow.ui \
+	debugger_disasm.ui \
+	controls.ui
+}
diff --git a/Qt/PPSSPPQt.pro b/Qt/PPSSPPQt.pro
index 8a2c9e21c0..05b11b0a95 100755
--- a/Qt/PPSSPPQt.pro
+++ b/Qt/PPSSPPQt.pro
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS = Native.pro Core.pro Common.pro PPSSPP.pro
+CONFIG += ordered
 PPSSPP.depends = Native.pro Core.pro Common.pro