[Scummvm-cvs-logs] scummvm master -> bf90ad04670c56fe0a1ba84f237d305f78755a2d

bgK bastien.bouclet at gmail.com
Sat Jun 28 17:40:41 CEST 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bf90ad0467 BUILD: Move the PS3 make targets to a separate file


Commit: bf90ad04670c56fe0a1ba84f237d305f78755a2d
    https://github.com/scummvm/scummvm/commit/bf90ad04670c56fe0a1ba84f237d305f78755a2d
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2014-06-28T17:12:43+02:00

Commit Message:
BUILD: Move the PS3 make targets to a separate file

Changed paths:
  A backends/platform/sdl/ps3/ps3.mk
    configure
    ports.mk



diff --git a/backends/platform/sdl/ps3/ps3.mk b/backends/platform/sdl/ps3/ps3.mk
new file mode 100644
index 0000000..a06409f
--- /dev/null
+++ b/backends/platform/sdl/ps3/ps3.mk
@@ -0,0 +1,27 @@
+ps3pkg: $(EXECUTABLE)
+	$(STRIP) $(EXECUTABLE)
+	sprxlinker $(EXECUTABLE)
+	mkdir -p ps3pkg/USRDIR/data/
+	mkdir -p ps3pkg/USRDIR/doc/
+	mkdir -p ps3pkg/USRDIR/saves/
+	make_self_npdrm "$(EXECUTABLE)" ps3pkg/USRDIR/EBOOT.BIN UP0001-SCUM12000_00-0000000000000000
+	cp $(DIST_FILES_THEMES) ps3pkg/USRDIR/data/
+ifdef DIST_FILES_ENGINEDATA
+	cp $(DIST_FILES_ENGINEDATA) ps3pkg/USRDIR/data/
+endif
+	cp $(DIST_FILES_DOCS) ps3pkg/USRDIR/doc/
+	cp $(srcdir)/dists/ps3/readme-ps3.md ps3pkg/USRDIR/doc/
+	cp $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip ps3pkg/USRDIR/data/
+	cp $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip ps3pkg/USRDIR/data/
+	cp $(srcdir)/dists/ps3/ICON0.PNG ps3pkg/
+	cp $(srcdir)/dists/ps3/PIC1.PNG ps3pkg/
+	sfo.py -f $(srcdir)/dists/ps3/sfo.xml ps3pkg/PARAM.SFO
+	pkg.py --contentid UP0001-SCUM12000_00-0000000000000000 ps3pkg/ scummvm-ps3.pkg
+
+ps3run: $(EXECUTABLE)
+	$(STRIP) $(EXECUTABLE)
+	sprxlinker $(EXECUTABLE)
+	make_self $(EXECUTABLE) $(EXECUTABLE).self
+	ps3load $(EXECUTABLE).self
+
+.PHONY: ps3pkg ps3run
diff --git a/configure b/configure
index 617d5a5..3d37473 100755
--- a/configure
+++ b/configure
@@ -2798,6 +2798,7 @@ if test -n "$_host"; then
 			_timidity=no
 			_vkeybd=yes
 			_eventrec=no
+			_port_mk="backends/platform/sdl/ps3/ps3.mk"
 			;;
 		psp)
 			_backend="psp"
diff --git a/ports.mk b/ports.mk
index f706a3d..32b1e67 100644
--- a/ports.mk
+++ b/ports.mk
@@ -341,34 +341,5 @@ ifdef DIST_FILES_ENGINEDATA
 endif
 	cp $(DIST_FILES_DOCS) $(AOS4PATH)
 
-#
-# PlayStation 3 specific
-#
-ps3pkg: $(EXECUTABLE)
-	$(STRIP) $(EXECUTABLE)
-	sprxlinker $(EXECUTABLE)
-	mkdir -p ps3pkg/USRDIR/data/
-	mkdir -p ps3pkg/USRDIR/doc/
-	mkdir -p ps3pkg/USRDIR/saves/
-	make_self_npdrm "$(EXECUTABLE)" ps3pkg/USRDIR/EBOOT.BIN UP0001-SCUM12000_00-0000000000000000
-	cp $(DIST_FILES_THEMES) ps3pkg/USRDIR/data/
-ifdef DIST_FILES_ENGINEDATA
-	cp $(DIST_FILES_ENGINEDATA) ps3pkg/USRDIR/data/
-endif
-	cp $(DIST_FILES_DOCS) ps3pkg/USRDIR/doc/
-	cp $(srcdir)/dists/ps3/readme-ps3.md ps3pkg/USRDIR/doc/
-	cp $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip ps3pkg/USRDIR/data/
-	cp $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip ps3pkg/USRDIR/data/
-	cp $(srcdir)/dists/ps3/ICON0.PNG ps3pkg/
-	cp $(srcdir)/dists/ps3/PIC1.PNG ps3pkg/
-	sfo.py -f $(srcdir)/dists/ps3/sfo.xml ps3pkg/PARAM.SFO
-	pkg.py --contentid UP0001-SCUM12000_00-0000000000000000 ps3pkg/ scummvm-ps3.pkg
-
-ps3run: $(EXECUTABLE)
-	$(STRIP) $(EXECUTABLE)
-	sprxlinker $(EXECUTABLE)
-	make_self $(EXECUTABLE) $(EXECUTABLE).self
-	ps3load $(EXECUTABLE).self
-
 # Mark special targets as phony
-.PHONY: deb bundle osxsnap win32dist install uninstall ps3pkg ps3run
+.PHONY: deb bundle osxsnap win32dist install uninstall






More information about the Scummvm-git-logs mailing list