[Scummvm-cvs-logs] SF.net SVN: scummvm: [29645] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Nov 26 16:59:22 CET 2007 

Revision: 29645
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29645&view=rev
Author:   fingolfin
Date:     2007-11-26 07:59:22 -0800 (Mon, 26 Nov 2007)

Log Message:
-----------
Moved port specific build rules from Makefile to ports.mk

Modified Paths:
--------------
    scummvm/trunk/Makefile

Added Paths:
-----------
    scummvm/trunk/ports.mk

Modified: scummvm/trunk/Makefile
===================================================================
--- scummvm/trunk/Makefile	2007-11-26 11:02:00 UTC (rev 29644)
+++ scummvm/trunk/Makefile	2007-11-26 15:59:22 UTC (rev 29645)
@@ -53,150 +53,4 @@
 	$(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)
 endif
 
-install: all
-	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
-	$(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
-	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
-	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
-	$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
-	$(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
-	$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
-	$(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/COPYRIGHT" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
-	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/scummvm/"
-	$(INSTALL) -c -m 644 "$(srcdir)/gui/themes/modern.ini" "$(srcdir)/gui/themes/modern.zip" "$(srcdir)/gui/themes/classic080.ini" "$(DESTDIR)$(DATADIR)/scummvm/"
-
-uninstall:
-	rm -f "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
-	rm -f "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
-	rm -f "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
-	rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
-	rm -rf "$(DESTDIR)$(DATADIR)/scummvm/"
-
-scummvmico.o: icons/scummvm.ico
-	$(WINDRES) dists/scummvm.rc scummvmico.o
-
-dist:
-	$(RM) $(ZIPFILE)
-	$(ZIP) $(ZIPFILE) $(DISTFILES)
-
-deb:
-	ln -sf dists/debian;
-	debian/prepare
-	fakeroot debian/rules binary
-
-
-# Special target to create a application wrapper for Mac OS X
-bundle_name = ScummVM.app
-bundle: scummvm-static
-	mkdir -p $(bundle_name)/Contents/MacOS
-	mkdir -p $(bundle_name)/Contents/Resources
-	echo "APPL????" > $(bundle_name)/Contents/PkgInfo
-	cp $(srcdir)/dists/macosx/Info.plist $(bundle_name)/Contents/
-	cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/
-	cp $(srcdir)/gui/themes/modern.ini $(bundle_name)/Contents/Resources/
-	cp $(srcdir)/gui/themes/modern.zip $(bundle_name)/Contents/Resources/
-	cp $(srcdir)/dists/pred.dic $(bundle_name)/Contents/Resources/
-	cp $(srcdir)/../../engine-data/trunk/kyra.dat $(bundle_name)/Contents/Resources/KYRA.DAT
-	cp $(srcdir)/../../engine-data/trunk/queen.tbl $(bundle_name)/Contents/Resources/
-	cp $(srcdir)/../../engine-data/trunk/sky.cpt $(bundle_name)/Contents/Resources/
-	cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
-	$(srcdir)/tools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf
-	strip $(bundle_name)/Contents/MacOS/scummvm
-
-iphonebundle:
-	mkdir -p $(bundle_name)
-	cp $(srcdir)/dists/iphone/Info.plist $(bundle_name)/
-	cp $(srcdir)/gui/themes/modern.ini $(bundle_name)/
-	cp $(srcdir)/gui/themes/modern.zip $(bundle_name)/
-	cp scummvm $(bundle_name)/ScummVM
-	cp $(srcdir)/dists/iphone/icon.png $(bundle_name)/icon.png
-	cp $(srcdir)/dists/iphone/Default.png $(bundle_name)/Default.png
-
-# location of additional libs for OS X usually /sw/ for fink or
-# /opt/local/ for darwinports
-OSXOPT=/sw
-
-# Static libaries, used for the scummvm-static target
-OSX_STATIC_LIBS := `sdl-config --static-libs`
-
-ifdef USE_VORBIS
-OSX_STATIC_LIBS += \
-		$(OSXOPT)/lib/libvorbisfile.a \
-		$(OSXOPT)/lib/libvorbis.a \
-		$(OSXOPT)/lib/libogg.a
-endif
-
-ifdef USE_FLAC
-OSX_STATIC_LIBS += $(OSXOPT)/lib/libFLAC.a
-endif
-
-ifdef USE_MAD
-OSX_STATIC_LIBS += $(OSXOPT)/lib/libmad.a
-endif
-
-ifdef USE_MPEG2
-OSX_STATIC_LIBS += $(OSXOPT)/lib/libmpeg2.a
-endif
-
-# Special target to create a static linked binary for Mac OS X.
-# We use -force_cpusubtype_ALL to ensure the binary runs on every
-# PowerPC machine.
-scummvm-static: $(OBJS)
-	$(CXX) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(OBJS) \
-		-framework CoreMIDI \
-		$(OSX_STATIC_LIBS) \
-		-lSystemStubs \
-		-lz
-
-# Special target to create a snapshot disk image for Mac OS X
-# TODO: Replace AUTHORS by Credits.rtf
-osxsnap: bundle credits
-	mkdir ScummVM-snapshot
-	cp AUTHORS ./ScummVM-snapshot/Authors
-	cp COPYING ./ScummVM-snapshot/License
-	cp COPYRIGHT ./ScummVM-snapshot/Copyright\ Holders
-	cp NEWS ./ScummVM-snapshot/News
-	cp README ./ScummVM-snapshot/ScummVM\ ReadMe
-	/Developer/Tools/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
-	/Developer/Tools/CpMac -r $(bundle_name) ./ScummVM-snapshot/
-	cp dists/macosx/DS_Store ./ScummVM-snapshot/.DS_Store
-	cp dists/macosx/background.jpg ./ScummVM-snapshot/background.jpg
-	/Developer/Tools/SetFile -a V ./ScummVM-snapshot/.DS_Store
-	/Developer/Tools/SetFile -a V ./ScummVM-snapshot/background.jpg
-	hdiutil create -ov -format UDZO -imagekey zlib-level=9 -fs HFS+ \
-					-srcfolder ScummVM-snapshot \
-					-volname "ScummVM snapshot" \
-					ScummVM-snapshot.dmg
-	rm -rf ScummVM-snapshot
-
-# Special target to create a win32 snapshot binary
-win32dist: scummvm$(EXEEXT)
-	mkdir -p $(WIN32PATH)
-	strip scummvm.exe -o $(WIN32PATH)/scummvm$(EXEEXT)
-	cp dists/pred.dic $(WIN32PATH)
-	cp gui/themes/modern.ini $(WIN32PATH)
-	cp gui/themes/modern.zip $(WIN32PATH)
-	cp AUTHORS $(WIN32PATH)/AUTHORS.txt
-	cp COPYING $(WIN32PATH)/COPYING.txt
-	cp COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
-	cp NEWS $(WIN32PATH)/NEWS.txt
-	cp README $(WIN32PATH)/README.txt
-	cp /usr/local/README-SDL.txt $(WIN32PATH)
-	cp /usr/local/bin/SDL.dll $(WIN32PATH)
-	u2d $(WIN32PATH)/*.txt
-
-# Special target to create an AmigaOS snapshot installation
-aos4dist: scummvm
-	mkdir -p $(AOS4PATH)
-	strip -R.comment $< -o $(AOS4PATH)/$<
-	cp icons/scummvm.info $(AOS4PATH)/$<.info
-	cp gui/themes/modern.ini $(AOS4PATH)
-	cp gui/themes/modern.zip $(AOS4PATH)
-	cp AUTHORS $(AOS4PATH)/AUTHORS.txt
-	cp COPYING $(AOS4PATH)/COPYING.txt
-	cp COPYRIGHT $(AOS4PATH)/COPYRIGHT.txt
-	cp NEWS $(AOS4PATH)/NEWS.txt
-	cp README $(AOS4PATH)/README.txt
-	cp /sdk/local/documentation/SDL-1.2.9/README-SDL.txt $(AOS4PATH)
-
-.PHONY: deb bundle osxsnap win32dist dist install uninstall
+include $(srcdir)/ports.mk

Added: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk	                        (rev 0)
+++ scummvm/trunk/ports.mk	2007-11-26 15:59:22 UTC (rev 29645)
@@ -0,0 +1,162 @@
+# This file contains port specific Makefile rules. It is automatically
+# included by the default (main) Makefile.
+
+
+#
+# UNIX specific
+#
+install: all
+	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
+	$(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
+	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
+	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
+	$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
+	$(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
+	$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
+	$(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/COPYRIGHT" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
+	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/scummvm/"
+	$(INSTALL) -c -m 644 "$(srcdir)/gui/themes/modern.ini" "$(srcdir)/gui/themes/modern.zip" "$(srcdir)/gui/themes/classic080.ini" "$(DESTDIR)$(DATADIR)/scummvm/"
+
+uninstall:
+	rm -f "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
+	rm -f "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
+	rm -f "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
+	rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
+	rm -rf "$(DESTDIR)$(DATADIR)/scummvm/"
+
+dist:
+	$(RM) $(ZIPFILE)
+	$(ZIP) $(ZIPFILE) $(DISTFILES)
+
+deb:
+	ln -sf dists/debian;
+	debian/prepare
+	fakeroot debian/rules binary
+
+
+# Special target to create a application wrapper for Mac OS X
+bundle_name = ScummVM.app
+bundle: scummvm-static
+	mkdir -p $(bundle_name)/Contents/MacOS
+	mkdir -p $(bundle_name)/Contents/Resources
+	echo "APPL????" > $(bundle_name)/Contents/PkgInfo
+	cp $(srcdir)/dists/macosx/Info.plist $(bundle_name)/Contents/
+	cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/
+	cp $(srcdir)/gui/themes/modern.ini $(bundle_name)/Contents/Resources/
+	cp $(srcdir)/gui/themes/modern.zip $(bundle_name)/Contents/Resources/
+	cp $(srcdir)/dists/pred.dic $(bundle_name)/Contents/Resources/
+	cp $(srcdir)/../../engine-data/trunk/kyra.dat $(bundle_name)/Contents/Resources/KYRA.DAT
+	cp $(srcdir)/../../engine-data/trunk/queen.tbl $(bundle_name)/Contents/Resources/
+	cp $(srcdir)/../../engine-data/trunk/sky.cpt $(bundle_name)/Contents/Resources/
+	cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
+	$(srcdir)/tools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf
+	strip $(bundle_name)/Contents/MacOS/scummvm
+
+iphonebundle:
+	mkdir -p $(bundle_name)
+	cp $(srcdir)/dists/iphone/Info.plist $(bundle_name)/
+	cp $(srcdir)/gui/themes/modern.ini $(bundle_name)/
+	cp $(srcdir)/gui/themes/modern.zip $(bundle_name)/
+	cp scummvm $(bundle_name)/ScummVM
+	cp $(srcdir)/dists/iphone/icon.png $(bundle_name)/icon.png
+	cp $(srcdir)/dists/iphone/Default.png $(bundle_name)/Default.png
+
+# location of additional libs for OS X usually /sw/ for fink or
+# /opt/local/ for darwinports
+OSXOPT=/sw
+
+# Static libaries, used for the scummvm-static target
+OSX_STATIC_LIBS := `sdl-config --static-libs`
+
+ifdef USE_VORBIS
+OSX_STATIC_LIBS += \
+		$(OSXOPT)/lib/libvorbisfile.a \
+		$(OSXOPT)/lib/libvorbis.a \
+		$(OSXOPT)/lib/libogg.a
+endif
+
+ifdef USE_FLAC
+OSX_STATIC_LIBS += $(OSXOPT)/lib/libFLAC.a
+endif
+
+ifdef USE_MAD
+OSX_STATIC_LIBS += $(OSXOPT)/lib/libmad.a
+endif
+
+ifdef USE_MPEG2
+OSX_STATIC_LIBS += $(OSXOPT)/lib/libmpeg2.a
+endif
+
+# Special target to create a static linked binary for Mac OS X.
+# We use -force_cpusubtype_ALL to ensure the binary runs on every
+# PowerPC machine.
+scummvm-static: $(OBJS)
+	$(CXX) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(OBJS) \
+		-framework CoreMIDI \
+		$(OSX_STATIC_LIBS) \
+		-lSystemStubs \
+		-lz
+
+# Special target to create a snapshot disk image for Mac OS X
+# TODO: Replace AUTHORS by Credits.rtf
+osxsnap: bundle credits
+	mkdir ScummVM-snapshot
+	cp AUTHORS ./ScummVM-snapshot/Authors
+	cp COPYING ./ScummVM-snapshot/License
+	cp COPYRIGHT ./ScummVM-snapshot/Copyright\ Holders
+	cp NEWS ./ScummVM-snapshot/News
+	cp README ./ScummVM-snapshot/ScummVM\ ReadMe
+	/Developer/Tools/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
+	/Developer/Tools/CpMac -r $(bundle_name) ./ScummVM-snapshot/
+	cp dists/macosx/DS_Store ./ScummVM-snapshot/.DS_Store
+	cp dists/macosx/background.jpg ./ScummVM-snapshot/background.jpg
+	/Developer/Tools/SetFile -a V ./ScummVM-snapshot/.DS_Store
+	/Developer/Tools/SetFile -a V ./ScummVM-snapshot/background.jpg
+	hdiutil create -ov -format UDZO -imagekey zlib-level=9 -fs HFS+ \
+					-srcfolder ScummVM-snapshot \
+					-volname "ScummVM snapshot" \
+					ScummVM-snapshot.dmg
+	rm -rf ScummVM-snapshot
+
+#
+# Windows specific
+#
+
+scummvmico.o: icons/scummvm.ico
+	$(WINDRES) dists/scummvm.rc scummvmico.o
+
+# Special target to create a win32 snapshot binary
+win32dist: scummvm$(EXEEXT)
+	mkdir -p $(WIN32PATH)
+	strip scummvm.exe -o $(WIN32PATH)/scummvm$(EXEEXT)
+	cp dists/pred.dic $(WIN32PATH)
+	cp gui/themes/modern.ini $(WIN32PATH)
+	cp gui/themes/modern.zip $(WIN32PATH)
+	cp AUTHORS $(WIN32PATH)/AUTHORS.txt
+	cp COPYING $(WIN32PATH)/COPYING.txt
+	cp COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
+	cp NEWS $(WIN32PATH)/NEWS.txt
+	cp README $(WIN32PATH)/README.txt
+	cp /usr/local/README-SDL.txt $(WIN32PATH)
+	cp /usr/local/bin/SDL.dll $(WIN32PATH)
+	u2d $(WIN32PATH)/*.txt
+
+#
+# AmigaOS specific
+#
+
+# Special target to create an AmigaOS snapshot installation
+aos4dist: scummvm
+	mkdir -p $(AOS4PATH)
+	strip -R.comment $< -o $(AOS4PATH)/$<
+	cp icons/scummvm.info $(AOS4PATH)/$<.info
+	cp gui/themes/modern.ini $(AOS4PATH)
+	cp gui/themes/modern.zip $(AOS4PATH)
+	cp AUTHORS $(AOS4PATH)/AUTHORS.txt
+	cp COPYING $(AOS4PATH)/COPYING.txt
+	cp COPYRIGHT $(AOS4PATH)/COPYRIGHT.txt
+	cp NEWS $(AOS4PATH)/NEWS.txt
+	cp README $(AOS4PATH)/README.txt
+	cp /sdk/local/documentation/SDL-1.2.9/README-SDL.txt $(AOS4PATH)
+
+.PHONY: deb bundle osxsnap win32dist dist install uninstall


Property changes on: scummvm/trunk/ports.mk
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the Scummvm-git-logs mailing list