Maelstrom-3.0.6

COPYING

@@ -1,14 +1,11 @@
 The source code to Maelstrom 3.0 and higher has been released under
 the GNU General Public License which can be found in COPYING.GPL.
 
-The artwork and sounds used by Maelstrom are copyright Ambrosia Software
-(http://www.ambrosiasw.com) and may not be redistributed separately from
-the Maelstrom public GPL release.
+The artwork and animations in Maelstrom may be used under the terms
+of the Creative Commons Attribution 3.0 license (unported):
+http://creativecommons.org/licenses/by/3.0/legalcode
 
 The following files must accompany any distribution of Maeltrom 3.0:
 	Ambrosia_Software,_Inc._FAQ
 	MaelstromGPL_press_release
 They can be found in the Docs directory.
-
-Copying, modifying, bundling, and burning to new ROMs is encouraged!
-

Changelog

@@ -1,5 +1,13 @@
 
-Maelstrom 3.0.5 -- Public GPL version
+Maelstrom 3.0.6 -- Public GPL version
+
+Version 3.0.6:
+	Sam Lantinga - Sat Oct 19 19:09:57 PDT 2002
+	*	Added support for MacBinary resource files
+	*	Updated README.joystick to reflect joystick support
+	*	Fixed volume lockup bug on MacOS X
+	Dean Larman-Moore - May 2002 00:20:43 +0100
+	*	Fixed network bug with more than one player
 
 Version 3.0.5:
 	Sam Lantinga - Fri Jul 20 08:09:14 PDT 2001

Docs/Makefile

@@ -1,4 +1,3 @@
-# Generated automatically from Makefile.in by configure.
 # This is the minimum Makefile necessary to include this directory
 # in the package distribution build process
 

Images/Makefile

@@ -1,4 +1,3 @@
-# Generated automatically from Makefile.in by configure.
 # This is the minimum Makefile necessary to include this directory
 # in the package distribution build process
 

Maelstrom.spec

@@ -0,0 +1,103 @@
+# Note that this is NOT a relocatable package
+%define name Maelstrom
+%define version 3.0.6
+%define release 1
+%define prefix /usr
+
+Summary: Simple DirectMedia Layer
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Source0: %{name}-%{version}.tar.gz
+URL: http://www.devolution.com/~slouken/Maelstrom/
+Copyright: GPL
+Group: Games
+BuildRoot: /var/tmp/%{name}-buildroot
+
+%description
+Maelstrom is a rockin' asteroids game ported from the Macintosh
+Originally written by Andrew Welch of Ambrosia Software, and ported
+to UNIX and then SDL by Sam Lantinga <slouken@devolution.com>
+
+%prep
+rm -rf ${RPM_BUILD_ROOT}
+
+%setup -q
+
+%build
+# Needed for snapshot releases.
+if [ ! -f configure ]; then
+  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix
+else
+  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
+fi
+
+if [ "$SMP" != "" ]; then
+  (make "MAKE=make -k -j $SMP"; exit 0)
+  make
+else
+  make
+fi
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install prefix=$RPM_BUILD_ROOT/%{prefix}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+# Add desktop menu bar items
+function Add_DeskTop_MenuItem
+{
+    desktop=$1; deskfile=$2
+    if [ -d "$desktop" ]; then
+        desktop="$desktop/Games"
+        if [ ! -d "$desktop" ]; then
+            mkdir "$desktop" 2>/dev/null
+        fi
+        if [ -w "$desktop" ]; then
+            echo "Creating $desktop/$deskfile"
+            cat >"$desktop/$deskfile" <<__EOF__
+# KDE Config File
+[KDE Desktop Entry]
+Name=Maelstrom
+Comment=Maelstrom
+Exec=/usr/bin/Maelstrom
+Icon=/usr/games/Maelstrom/icon.xpm
+Terminal=0
+Type=Application
+__EOF__
+        fi
+    fi
+}
+echo "============================================================="
+echo "Adding desktop menu items ..."
+for gnomedir in "/opt/gnome" "/usr/share/gnome" "$HOME/.gnome"
+do Add_DeskTop_MenuItem "$gnomedir/apps" "maelstrom.desktop"
+done
+for kdedir in "/opt/kde" "/usr/share/kde" "$HOME/.kde"
+do Add_DeskTop_MenuItem "$kdedir/share/applnk" "maelstrom.kdelnk"
+done
+
+%postun
+echo "============================================================="
+echo "Removing desktop menu items ..."
+for gnomedir in "/opt/gnome" "/usr/share/gnome" "$HOME/.gnome"
+do rm -f "$gnomedir/apps/Games/maelstrom.desktop"
+done
+for kdedir in "/opt/kde" "/usr/share/kde" "$HOME/.kde"
+do rm -f "$kdedir/share/applnk/Games/maelstrom.kdelnk"
+done
+
+%files
+%defattr(-, root, root)
+%doc COPYING* CREDITS README* Changelog Docs
+%{prefix}/bin/Maelstrom
+%{prefix}/games/Maelstrom
+
+%changelog
+* Tue Sep 21 1999 Sam Lantinga <slouken@devolution.com>
+
+- first attempt at a spec file
+

Maelstrom.spec.in

@@ -1,28 +1,28 @@
 # Note that this is NOT a relocatable package
-%define ver      @VERSION@
-%define rel      1
-%define prefix   /usr
+%define name @PACKAGE@
+%define version @VERSION@
+%define release 1
+%define prefix /usr
 
-Summary:   Maelstrom
-Name:      Maelstrom
-Version:   %ver
-Release:   %rel
-Copyright: LGPL
-Group:     Libraries
-Source0:   @PACKAGE@-%{PACKAGE_VERSION}.tar.gz
-URL:       http://www.devolution.com/~slouken/Maelstrom/
-BuildRoot: /tmp/@PACKAGE@-%{PACKAGE_VERSION}-root
-Packager:  Sam Lantinga <slouken@devolution.com>
-Docdir: %{prefix}/doc
+Summary: Simple DirectMedia Layer
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Source0: %{name}-%{version}.tar.gz
+URL: http://www.devolution.com/~slouken/Maelstrom/
+Copyright: GPL
+Group: Games
+BuildRoot: /var/tmp/%{name}-buildroot
 
 %description
 Maelstrom is a rockin' asteroids game ported from the Macintosh
 Originally written by Andrew Welch of Ambrosia Software, and ported
 to UNIX and then SDL by Sam Lantinga <slouken@devolution.com>
 
 %prep
+rm -rf ${RPM_BUILD_ROOT}
 
-%setup
+%setup -q
 
 %build
 # Needed for snapshot releases.
@@ -41,8 +41,7 @@ fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+make install prefix=$RPM_BUILD_ROOT/%{prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT

Makefile.am

@@ -59,7 +59,7 @@ EXTRA_DIST =			\
 	Maelstrom-Scores	\
 	ico_o			\
 	icon.bmp icon.xpm	\
-	Maelstrom.spec.in
+	Maelstrom.spec
 
 DIST_SUBDIRS = $(SUBDIRS) Images Docs
 
@@ -86,6 +86,4 @@ $(PACKAGE)-$(VERSION).tar.gz: dist
 
 # Rule to build RPM distribution package
 rpm: $(PACKAGE)-$(VERSION).tar.gz
-	cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES
-	rpm -ba Maelstrom.spec
-
+	rpm -ta $(PACKAGE)-$(VERSION).tar.gz

Makefile.in

@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -85,7 +85,7 @@ Maelstrom_LDADD =  	$(LOGIC)/liblogic.a			screenlib/libSDLscreen.a		maclib/libSD
 
 SUBDIRS = $(LOGIC) screenlib maclib
 
-EXTRA_DIST =  	autogen.sh			VisualC.zip			PBProjects.tar.gz		MPWmake.sea.bin			CREDITS				Changelog			README.joystick			README.network			README.options			COPYING				COPYING.GPL			Images				Maelstrom_Fonts			Maelstrom_Sounds		Maelstrom_Sprites		Maelstrom-Scores		ico_o				icon.bmp icon.xpm		Maelstrom.spec.in
+EXTRA_DIST =  	autogen.sh			VisualC.zip			PBProjects.tar.gz		MPWmake.sea.bin			CREDITS				Changelog			README.joystick			README.network			README.options			COPYING				COPYING.GPL			Images				Maelstrom_Fonts			Maelstrom_Sounds		Maelstrom_Sprites		Maelstrom-Scores		ico_o				icon.bmp icon.xpm		Maelstrom.spec
 
 
 DIST_SUBDIRS = $(SUBDIRS) Images Docs
@@ -239,7 +239,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	  test "$$subdir" != "." || dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -333,7 +333,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -350,7 +350,6 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
-
 info-am:
 info: info-recursive
 dvi-am:
@@ -453,8 +452,7 @@ $(PACKAGE)-$(VERSION).tar.gz: dist
 
 # Rule to build RPM distribution package
 rpm: $(PACKAGE)-$(VERSION).tar.gz
-	cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES
-	rpm -ba Maelstrom.spec
+	rpm -ta $(PACKAGE)-$(VERSION).tar.gz
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

README.joystick

@@ -1,28 +1,10 @@
 
 				JOYSTICKS
 
-[NOTE:  Joystick support is temporarily broken - being added to SDL]
-
---- OLD README ---
-If you don't already have it, you need to download the Linux joystick
-driver and install it to use the joystick support in Maelstrom.
-
-Maelstrom was developed with version 1.7.3 of the joystick driver,
-available currently at sunsite.unc.edu in /pub/Linux/kernel/patches/console
-
-Note, you may have to tweak the driver some to get it to compile for
-the current version of Linux.  It shouldn't be too bad.
-
-Don't forget to create the joystick device and load the joystick module
-before you start Maelstrom with joystick support!
-
-Here's the command to create the joystick device:
-(as root)
-	mknod /dev/js0 c 15 0
-
-When you start Maelstrom for the first time, you'll want to give it
-the "-calibrate <device>" option, to calibrate your joystick.
-"<device>" is the pathname of your joystick device, i.e. /dev/js0
+Maelstrom uses SDL's joystick support, so they should just work.  Moving
+the joystick left and right rotates the ship, and pushing it forward will
+accelerate the ship.  The first joystick button fires the ship's weapons
+and the second joystick button activates the shields.
 
 Enjoy!
 	-Sam Lantinga			(slouken@devolution.com)

acinclude.m4

@@ -32,7 +32,9 @@ AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run
      fi
   fi
 
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+  AC_REQUIRE([AC_CANONICAL_TARGET])
+  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
   min_sdl_version=ifelse([$1], ,0.11.0,$1)
   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   no_sdl=""
@@ -71,7 +73,7 @@ my_strdup (char *str)
   
   if (str)
     {
-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
+      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
       strcpy (new_str, str);
     }
   else
@@ -80,12 +82,15 @@ my_strdup (char *str)
   return new_str;
 }
 
-int main ()
+int main (int argc, char *argv[])
 {
   int major, minor, micro;
   char *tmp_version;
 
+  /* This hangs on some systems (?)
   system ("touch conf.sdltest");
+  */
+  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
 
   /* HP/UX 9 (%@#!) writes to sscanf strings */
   tmp_version = my_strdup("$min_sdl_version");
@@ -137,6 +142,11 @@ int main ()
           AC_TRY_LINK([
 #include <stdio.h>
 #include "SDL.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef  main
+#define main K_and_R_C_main
 ],      [ return 0; ],
         [ echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding SDL or finding the wrong"