Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Qt: Don't detect executable by name (in case we change it).

Browse source
This commit is contained in:
Sacha 2014-07-11 02:41:13 +10:00
parent 10be547ec0
commit 88cfcf7e26
10 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Qt/Core.pro
View file

@ -6,6 +6,7 @@ CONFIG += staticlib
include(Settings.pri) include(Settings.pri)
INCLUDEPATH += $$P/ $$P/native $$P/Core/MIPS $$P/ext/xbrz INCLUDEPATH += $$P/ $$P/native $$P/Core/MIPS $$P/ext/xbrz
!contains(DEFINES, USING_GLES2): INCLUDEPATH += $$P/native/ext/glew
arm { arm {
SOURCES += $$P/Core/MIPS/ARM/*.cpp \ #CoreARM SOURCES += $$P/Core/MIPS/ARM/*.cpp \ #CoreARM

4
Qt/GPU.pro
View file

@ -21,7 +21,7 @@ win32 {
INCLUDEPATH += $$P/dx9sdk/Include INCLUDEPATH += $$P/dx9sdk/Include
} }
SOURCES += $$P/GPU/GeDisasm.cpp \ # GPU SOURCES += $$P/GPU/GeDisasm.cpp \ # GPU
$$P/GPU/GPUCommon.cpp \ $$P/GPU/GPUCommon.cpp \
$$P/GPU/GPUState.cpp \ $$P/GPU/GPUState.cpp \
$$P/GPU/Math3D.cpp \ $$P/GPU/Math3D.cpp \
@ -55,7 +55,7 @@ armv7: SOURCES += $$P/GPU/Common/TextureDecoderNEON.cpp
arm: SOURCES += $$P/GPU/GLES/VertexDecoderArm.cpp arm: SOURCES += $$P/GPU/GLES/VertexDecoderArm.cpp
else: SOURCES += $$P/GPU/GLES/VertexDecoderX86.cpp else: SOURCES += $$P/GPU/GLES/VertexDecoderX86.cpp
HEADERS += $$P/GPU/GLES/*.h \ HEADERS += $$P/GPU/GLES/*.h \
$$P/GPU/Software/*.h \ $$P/GPU/Software/*.h \
$$P/GPU/Debugger/*.h \ $$P/GPU/Debugger/*.h \
$$P/GPU/Common/*.h \ $$P/GPU/Common/*.h \

2
Qt/Platform/Windows.pri
View file

@ -2,7 +2,7 @@ PRECOMPILED_HEADER = $$P/Windows/stdafx.h
PRECOMPILED_SOURCE = $$P/Windows/stdafx.cpp PRECOMPILED_SOURCE = $$P/Windows/stdafx.cpp
INCLUDEPATH += $$P INCLUDEPATH += $$P
equals(TARGET, PPSSPPQt) { !contains(CONFIG, staticlib) {
# Executable # Executable
# Use a fixed base-address under windows # Use a fixed base-address under windows
QMAKE_LFLAGS += /FIXED /BASE:"0x00400000" /DYNAMICBASE:NO QMAKE_LFLAGS += /FIXED /BASE:"0x00400000" /DYNAMICBASE:NO

2
Qt/Platform/android.pri
View file

@ -1,7 +1,7 @@
DEFINES += ANDROID DEFINES += ANDROID
INCLUDEPATH += $$P/native/ext/libzip INCLUDEPATH += $$P/native/ext/libzip
equals(TARGET, PPSSPPQt) { !contains(CONFIG, staticlib) {
# Packaging # Packaging
ANDROID_PACKAGE_SOURCE_DIR = $$P/android ANDROID_PACKAGE_SOURCE_DIR = $$P/android
} }

2
Qt/Platform/blackberry.pri
View file

@ -1,7 +1,7 @@
# Use a mkspec that allows g++ # Use a mkspec that allows g++
DEFINES += BLACKBERRY "_QNX_SOURCE=1" "_C99=1" DEFINES += BLACKBERRY "_QNX_SOURCE=1" "_C99=1"
equals(TARGET, PPSSPPQt) { !contains(CONFIG, staticlib) {
# Executable # Executable
LIBS += -lscreen -liconv LIBS += -lscreen -liconv
} }

2
Qt/Platform/linux.pri
View file

@ -1,6 +1,6 @@
equals(TARGET, PPSSPPQt) { !contains(CONFIG, staticlib) {
# Executable # Executable
LIBS += -ldl -lrt LIBS += -ldl -lrt

2
Qt/Platform/macosx.pri
View file

@ -1,6 +1,6 @@
QMAKE_MAC_SDK=macosx10.9 QMAKE_MAC_SDK=macosx10.9
equals(TARGET, PPSSPPQt) { !contains(CONFIG, staticlib) {
# Executable # Executable
LIBS += -liconv LIBS += -liconv
} }

2
Qt/Platform/maemo.pri
View file

@ -1,7 +1,7 @@
DEFINES += MAEMO __GL_EXPORTS DEFINES += MAEMO __GL_EXPORTS
contains(MEEGO_EDITION,harmattan): DEFINES += "_SYS_UCONTEXT_H=1" contains(MEEGO_EDITION,harmattan): DEFINES += "_SYS_UCONTEXT_H=1"
equals(TARGET, PPSSPPQt) { !contains(CONFIG, staticlib) {
# Packaging # Packaging
target.path = /opt/PPSSPP/bin target.path = /opt/PPSSPP/bin
desktopfile.files = PPSSPP.desktop desktopfile.files = PPSSPP.desktop

2
Qt/Platform/symbian.pri
View file

@ -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 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 QMAKE_CXXFLAGS += -marm -Wno-parentheses -Wno-comment -Wno-unused-local-typedefs
contains(TARGET, PPSSPPQt) { !contains(CONFIG, staticlib) {
# Executable # Executable
LIBS += -lremconcoreapi -lremconinterfacebase LIBS += -lremconcoreapi -lremconinterfacebase

2
Qt/Settings.pri
View file

@ -19,7 +19,7 @@ include(Platform/OSDetection.pri)
# OS dependent paths # OS dependent paths
INCLUDEPATH += $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/include 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/ QMAKE_LIBDIR += $$CONFIG_DIR $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/lib/
contains(DEFINES, USE_FFMPEG): LIBS += -lavformat -lavcodec -lavutil -lswresample -lswscale contains(DEFINES, USE_FFMPEG): LIBS += -lavformat -lavcodec -lavutil -lswresample -lswscale
equals(PLATFORM_NAME, "linux"):arm|android: LIBS += -lEGL equals(PLATFORM_NAME, "linux"):arm|android: LIBS += -lEGL