mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-07-11 01:25:07 +02:00
Qt: Change target name to ppsspp by default.Install icons and desktop file on Linux. Use a different builddir than SDL by default.
Should help distros packaging ppsspp. Note: if you currently use PPSSPPQt, you will need to move the config dir from PPSSPPQt to ppsspp. For distro packagers, you can now use PREFIX and DESTDIR for installs.
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
||||
TARGET = PPSSPPQt
|
||||
TARGET = ppsspp
|
||||
|
||||
# Main Qt modules
|
||||
QT += core gui opengl
|
||||
|
||||
+26
-3
@@ -1,11 +1,34 @@
|
||||
|
||||
|
||||
!contains(CONFIG, staticlib) {
|
||||
isEmpty(PREFIX) {
|
||||
PREFIX = /usr
|
||||
}
|
||||
|
||||
# Executable
|
||||
LIBS += -ldl -lrt
|
||||
|
||||
# Packaging
|
||||
icon.files = $$P/assets/icon-114.png
|
||||
icon.path = /usr/share/icons/hicolor/114x114/apps
|
||||
INSTALLS += icon
|
||||
icon16.files = $$P/assets/unix-icons/hicolor/16x16/apps/ppsspp.png
|
||||
icon16.path = $$DESTDIR$$PREFIX/share/icons/hicolor/16x16/apps
|
||||
|
||||
icon32.files = $$P/assets/unix-icons/hicolor/32x32/apps/ppsspp.png
|
||||
icon32.path = $$DESTDIR$$PREFIX/share/icons/hicolor/32x32/apps
|
||||
|
||||
icon64.files = $$P/assets/unix-icons/hicolor/64x64/apps/ppsspp.png
|
||||
icon64.path = $$DESTDIR$$PREFIX/share/icons/hicolor/64x64/apps
|
||||
|
||||
icon96.files = $$P/assets/unix-icons/hicolor/96x96/apps/ppsspp.png
|
||||
icon96.path = $$DESTDIR$$PREFIX/share/icons/hicolor/96x96/apps
|
||||
|
||||
icon256.files = $$P/assets/unix-icons/hicolor/256x256/apps/ppsspp.png
|
||||
icon256.path = $$DESTDIR$$PREFIX/share/icons/hicolor/256x256/apps
|
||||
|
||||
icon512.files = $$P/assets/unix-icons/hicolor/512x512/apps/ppsspp.png
|
||||
icon512.path = $$DESTDIR$$PREFIX/share/icons/hicolor/512x512/apps
|
||||
|
||||
applications.files = $$P/debian/ppsspp.desktop
|
||||
applications.path = $$DESTDIR$$PREFIX/share/applications
|
||||
|
||||
INSTALLS += icon16 icon32 icon64 icon96 icon256 icon512 applications
|
||||
}
|
||||
|
||||
+2
-1
@@ -22,7 +22,8 @@ include(Platform/OSDetection.pri)
|
||||
!system_ffmpeg: INCLUDEPATH += $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/include
|
||||
|
||||
!contains(CONFIG, staticlib) {
|
||||
!system_ffmpeg: QMAKE_LIBDIR += $$CONFIG_DIR $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/lib/
|
||||
QMAKE_LIBDIR += $$CONFIG_DIR
|
||||
!system_ffmpeg: QMAKE_LIBDIR += $$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
|
||||
}
|
||||
|
||||
@@ -77,7 +77,11 @@ if [ ! -z "$TARGET_OS" ]; then
|
||||
fi
|
||||
else
|
||||
echo "Building for native host."
|
||||
BUILD_DIR="build"
|
||||
if [ "$CMAKE" == "0" ]; then
|
||||
BUILD_DIR="build-qt"
|
||||
else
|
||||
BUILD_DIR="build"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Strict errors. Any non-zero return exits this script
|
||||
|
||||
Vendored
+1
-1
@@ -55,7 +55,7 @@ install:
|
||||
|
||||
# Add here commands to install the package into debian/retroarch.
|
||||
#$(MAKE) -C build-qt DESTDIR=$(CURDIR)/debian/ppsspp PREFIX=/usr install # make install of ppsspp installs only icons... needs improvement by upstream
|
||||
cp $(CURDIR)/build-qt/PPSSPPQt $(CURDIR)/debian/ppsspp/usr/games/ppsspp
|
||||
cp $(CURDIR)/build-qt/ppsspp $(CURDIR)/debian/ppsspp/usr/games/ppsspp
|
||||
cp $(CURDIR)/debian/ppsspp.desktop $(CURDIR)/debian/ppsspp/usr/share/applications/
|
||||
cp -r $(CURDIR)/assets/unix-icons/hicolor/* $(CURDIR)/debian/ppsspp/usr/share/icons/hicolor/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user