[Scummvm-cvs-logs] CVS: scummvm AUTHORS,1.12,1.13 Makefile,1.98,1.99 NEWS,1.117,1.118 README,1.323,1.324 configure,1.119,1.120

Max Horn fingolfin at users.sourceforge.net
Mon May 9 14:23:28 CEST 2005


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31171

Modified Files:
	AUTHORS Makefile NEWS README configure 
Log Message:
Patch #1181544 (AmigaOS 4 changes)

Index: AUTHORS
===================================================================
RCS file: /cvsroot/scummvm/scummvm/AUTHORS,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- AUTHORS	9 May 2005 00:11:08 -0000	1.12
+++ AUTHORS	9 May 2005 21:21:15 -0000	1.13
@@ -20,6 +20,7 @@
        Jamieson Christian    - iMUSE, MIDI, all things musical
        Jerome Fisher         - MT-32 emulator
        Jochen Hoenicke       - Speaker & PCjr sound support, Adlib work
+       Hans-Jorg Frieden     - Port: AmigaOS 4
 
 Retired Team Members:
        Ralph Brorsen         - Help with GUI implementation
@@ -53,6 +54,7 @@
        Johannes Schickel     - Thumbnails for ScummEngine
        Andre Souza           - SDL-based OpenGL renderer
        Tim ???               - Initial MI1 CD music support
+       Juha Niemimaki        - AmigaOS 4 port maintaining
 
        And to all the contributors, users, and beta testers we've missed.
        Thanks!

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- Makefile	9 May 2005 01:10:00 -0000	1.98
+++ Makefile	9 May 2005 21:21:15 -0000	1.99
@@ -19,10 +19,10 @@
 include config.mak
 
 # Uncomment this for stricter compile time code verification
-# CXXFLAGS+= -Werror
+CXXFLAGS+= -Werror
 
 CXXFLAGS:= -Wall $(CXXFLAGS)
-CXXFLAGS+= -O -Wuninitialized
+# CXXFLAGS+= -O -Wuninitialized
 CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
 # Even more warnings...
 CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion

Index: NEWS
===================================================================
RCS file: /cvsroot/scummvm/scummvm/NEWS,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- NEWS	9 May 2005 00:09:49 -0000	1.117
+++ NEWS	9 May 2005 21:21:16 -0000	1.118
@@ -7,6 +7,10 @@
      and "Inherit the Earth").
    - Added Gob engine (for Goblins series)
 
+ New Ports:
+   - Added PlayStation 2 port
+   - Added AmigaOS 4 port
+
  General:
    - Reworked cursor handling in SDL backend. Now cursors can have their own
      palette and scaling. This is used by Humongous Entertainment games now.

Index: README
===================================================================
RCS file: /cvsroot/scummvm/scummvm/README,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- README	23 Apr 2005 13:52:26 -0000	1.323
+++ README	9 May 2005 21:21:16 -0000	1.324
@@ -1247,7 +1247,15 @@
           etc. via Fink and into /sw. If you have installed SDL
           in another way, you'll have to edit the Makefile).
 
-
+    AmigaOS 4 (Cross-compiling with Cygwin):
+        * Make sure that you have SDL installed, you may also need 
+          libogg, libvorbis, libvorbisfile, zlib, libmad.
+        * Type ./configure --host=ppc-amigaos
+        * If you got an error about sdl-config, use --with-sdl-prefix
+          parameter to set the path.
+        * Check 'config.mak' file and if everything seems to fine:
+        * Run 'make'.
+        * Cross-compiling with Linux may be as easy.
 
 ------------------------------------------------------------------------
 Good Luck and Happy Adventuring!

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- configure	7 May 2005 16:29:11 -0000	1.119
+++ configure	9 May 2005 21:21:16 -0000	1.120
@@ -434,6 +434,10 @@
 	_host_os=riscos
 	_host_cpu=arm
 	;;
+ppc-amigaos)
+	_host_os=amigaos
+	_host_cpu=ppc
+	;;
 *)
 	guessed_host=`$_srcdir/config.guess`
 	_host_cpu=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -613,6 +617,16 @@
 			type_2_byte='short'
 			type_4_byte='int'
 			;;
+		ppc-amigaos)
+			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
+			_def_endianness='#define SCUMM_BIG_ENDIAN'
+			_def_align='#define	SCUMM_NEED_ALIGNMENT'
+			type_1_byte='char'
+			type_2_byte='short'
+			type_4_byte='long'
+			CXXFLAGS="$CFLAGS -newlib -mstrict-align -mcpu=750 -mtune=7400"
+			LDFLAGS="$LDFLAGS -newlib"
+			;;
 		*)
 			echo "Cross-compiling to unknown target, please add your target to configure."
 			exit 1





More information about the Scummvm-git-logs mailing list