mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
Force Qt to build the libs in order, and relink exe if a lib change
This commit is contained in:
parent
510f1ac3f4
commit
f7205f6543
2 changed files with 77 additions and 75 deletions
151
Qt/PPSSPP.pro
151
Qt/PPSSPP.pro
|
@ -1,75 +1,76 @@
|
||||||
TARGET = PPSSPPQt
|
TARGET = PPSSPPQt
|
||||||
QT += core gui opengl
|
QT += core gui opengl
|
||||||
|
|
||||||
include(Settings.pri)
|
include(Settings.pri)
|
||||||
linux {
|
linux {
|
||||||
CONFIG += mobility
|
CONFIG += mobility
|
||||||
MOBILITY += multimedia
|
MOBILITY += multimedia
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
QT += multimedia
|
QT += multimedia
|
||||||
}
|
}
|
||||||
|
|
||||||
# Libs
|
# Libs
|
||||||
symbian: LIBS += -lCore.lib -lCommon.lib -lNative.lib -lcone -leikcore -lavkon -lezlib
|
symbian: LIBS += -lCore.lib -lCommon.lib -lNative.lib -lcone -leikcore -lavkon -lezlib
|
||||||
|
|
||||||
blackberry: LIBS += -L. -lCore -lCommon -lNative -lscreen -lsocket -lstdc++
|
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
|
win32: LIBS += -L. -lCore -lCommon -lNative -lwinmm -lws2_32 -lkernel32 -luser32 -lgdi32 -lshell32 -lcomctl32 -ldsound -lxinput
|
||||||
|
|
||||||
linux: LIBS += -L. -lCore -lCommon -lNative
|
linux: LIBS += -L. -lCore -lCommon -lNative
|
||||||
|
linux: PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a
|
||||||
# Main
|
|
||||||
SOURCES += ../native/base/QtMain.cpp
|
# Main
|
||||||
HEADERS += ../native/base/QtMain.h
|
SOURCES += ../native/base/QtMain.cpp
|
||||||
|
HEADERS += ../native/base/QtMain.h
|
||||||
# Native
|
|
||||||
SOURCES += ../android/jni/EmuScreen.cpp \
|
# Native
|
||||||
../android/jni/MenuScreens.cpp \
|
SOURCES += ../android/jni/EmuScreen.cpp \
|
||||||
../android/jni/GamepadEmu.cpp \
|
../android/jni/MenuScreens.cpp \
|
||||||
../android/jni/UIShader.cpp \
|
../android/jni/GamepadEmu.cpp \
|
||||||
../android/jni/ui_atlas.cpp
|
../android/jni/UIShader.cpp \
|
||||||
|
../android/jni/ui_atlas.cpp
|
||||||
INCLUDEPATH += .. ../Common ../native
|
|
||||||
|
INCLUDEPATH += .. ../Common ../native
|
||||||
# Temporarily only use new UI for Linux desktop
|
|
||||||
linux:!mobile_platform {
|
# Temporarily only use new UI for Linux desktop
|
||||||
SOURCES += mainwindow.cpp \
|
linux:!mobile_platform {
|
||||||
debugger_disasm.cpp \
|
SOURCES += mainwindow.cpp \
|
||||||
EmuThread.cpp\
|
debugger_disasm.cpp \
|
||||||
QtHost.cpp \
|
EmuThread.cpp\
|
||||||
qtemugl.cpp \
|
QtHost.cpp \
|
||||||
ctrldisasmview.cpp \
|
qtemugl.cpp \
|
||||||
ctrlregisterlist.cpp \
|
ctrldisasmview.cpp \
|
||||||
controls.cpp
|
ctrlregisterlist.cpp \
|
||||||
HEADERS += mainwindow.h \
|
controls.cpp
|
||||||
debugger_disasm.h \
|
HEADERS += mainwindow.h \
|
||||||
EmuThread.h \
|
debugger_disasm.h \
|
||||||
QtHost.h \
|
EmuThread.h \
|
||||||
qtemugl.h \
|
QtHost.h \
|
||||||
ctrldisasmview.h \
|
qtemugl.h \
|
||||||
ctrlregisterlist.h \
|
ctrldisasmview.h \
|
||||||
controls.h
|
ctrlregisterlist.h \
|
||||||
} else {
|
controls.h
|
||||||
SOURCES += ../android/jni/NativeApp.cpp
|
} else {
|
||||||
}
|
SOURCES += ../android/jni/NativeApp.cpp
|
||||||
|
}
|
||||||
# Packaging
|
|
||||||
symbian {
|
# Packaging
|
||||||
vendorinfo = "%{\"Qtness\"}" ":\"Qtness\""
|
symbian {
|
||||||
packageheader = "$${LITERAL_HASH}{\"PPSSPP\"}, (0xE0095B1D), 0, 6, 1, TYPE=SA"
|
vendorinfo = "%{\"Qtness\"}" ":\"Qtness\""
|
||||||
deployinfo.pkg_prerules = packageheader vendorinfo
|
packageheader = "$${LITERAL_HASH}{\"PPSSPP\"}, (0xE0095B1D), 0, 6, 1, TYPE=SA"
|
||||||
assets.sources = ../android/assets/ui_atlas.zim ../assets/ppge_atlas.zim
|
deployinfo.pkg_prerules = packageheader vendorinfo
|
||||||
assets.path = E:/PPSSPP
|
assets.sources = ../android/assets/ui_atlas.zim ../assets/ppge_atlas.zim
|
||||||
DEPLOYMENT += deployinfo assets
|
assets.path = E:/PPSSPP
|
||||||
ICON = ../assets/icon.svg
|
DEPLOYMENT += deployinfo assets
|
||||||
# 268MB maximum
|
ICON = ../assets/icon.svg
|
||||||
TARGET.EPOCHEAPSIZE = 0x40000 0x10000000
|
# 268MB maximum
|
||||||
TARGET.EPOCSTACKSIZE = 0x10000
|
TARGET.EPOCHEAPSIZE = 0x40000 0x10000000
|
||||||
}
|
TARGET.EPOCSTACKSIZE = 0x10000
|
||||||
|
}
|
||||||
linux:!mobile_platform {
|
|
||||||
FORMS += mainwindow.ui \
|
linux:!mobile_platform {
|
||||||
debugger_disasm.ui \
|
FORMS += mainwindow.ui \
|
||||||
controls.ui
|
debugger_disasm.ui \
|
||||||
}
|
controls.ui
|
||||||
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
SUBDIRS = Native.pro Core.pro Common.pro PPSSPP.pro
|
SUBDIRS = Native.pro Core.pro Common.pro PPSSPP.pro
|
||||||
|
CONFIG += ordered
|
||||||
PPSSPP.depends = Native.pro Core.pro Common.pro
|
PPSSPP.depends = Native.pro Core.pro Common.pro
|
||||||
|
|
Loading…
Add table
Reference in a new issue