MegaZeux 2.81b release.

Makefile.in

@@ -9,8 +9,8 @@ GDM2S3M   = contrib/gdm2s3m/src
 MODPLUG   = contrib/libmodplug/src
 
 # default target name
-TARGET    = mzx281
-VERSION   = 2.81
+TARGET    = mzx281b
+VERSION   = 2.81b
 
 ifneq ("${DATE}", "0")
 VERSTRING = ${VERSION}\ \(`date +%Y%m%d`\)

arch/Makefile.linux-static

@@ -0,0 +1,16 @@
+#
+# linux-static makefile generics
+#
+
+all: subdir
+debug: subdir-debug
+
+# location of strip (must be defined)
+STRIP     = strip --strip-unneeded
+
+# standard libraries
+LIBS      = ../${GDM2S3M}/libgdm2s3m.a ../${MODPLUG}/libmodplug.a \
+            ${PREFIX}/lib/libvorbisfile.a ${PREFIX}/lib/libvorbis.a \
+            ${PREFIX}/lib/libogg.a ${PREFIX}/lib/libstdc++.a \
+            -L${PREFIX}/lib -lSDL -lpthread
+

config.sh

@@ -45,18 +45,25 @@ echo "PREFIX=$PREFIX"   >> Makefile.platform
 
 echo "#define CONFDIR  \"$SYSCONFDIR/\"" > src/config.h
 
-if [ "$ARCH" = "win32" -o "$ARCH" = "macos" ]; then
+#
+# Windows, MacOS X and Linux-Static all want to read files
+# relative to their install directory. Every other platform
+# wants to read from a /usr tree, and rename config.txt.
+#
+if [ "$ARCH" = "win32" -o "$ARCH" = "macos" -o "$ARCH" = "linux-static" ]; then
 	echo "#define SHAREDIR \"./\""         >> src/config.h
 	echo "#define CONFFILE \"config.txt\"" >> src/config.h
-fi
-
-if [ "$ARCH" = "linux" ]; then
+else
 	echo "#define SHAREDIR \"$PREFIX/share/megazeux/\"" >> src/config.h
 	echo "#define CONFFILE \"megazeux-config\""         >> src/config.h
+fi
 
+#
+# linux target has "make install", which requires these features
+#
+if [ "$ARCH" = "linux" ]; then
 	echo "TARGET=`grep TARGET Makefile.in | cut -d ' ' -f 6`" \
 		>> Makefile.platform
-
 	echo "SYSCONFDIR=$SYSCONFDIR" >> Makefile.platform
 fi
 

config.txt

@@ -230,6 +230,11 @@ modplug_resample_mode = cubic
 
 #backup_name = backup
 
+# The extension of backup files (keep this .mzx if you want to be able
+# to easily load them)
+
+#backup_ext = .mzx
+
 
 # Joystick options
 

docs/changelog.txt

@@ -1,3 +1,69 @@
+November 26, 2005 - MZX 2.81b
+
++ Fixed inability to make proper .savs of worlds with strings (they'd
+  crash when loaded..)
++ Fixed PC speaker audio bug causing a constant high pitched noise to
+  be played instead of PC speaker audio sometimes.
++ Fixed some issues with long pathnames.
++ Fixed a bug causing Caverns to crash in recent versions (long story,
+  it was most likely due to an error in ver1to2)
++ Now when you set mzx_speed in a game you can no longer change the
+  speed from the F2 menu. Setting mzx_speed to 0 reallows this (and
+  doesn't set the speed)
++ When loading a game its speed is now set to the speed MZX started
+  with (whatever's in config.txt, or the default of 4)
++ Added backup_ext config.txt option to specify the extension of backup
+  files (default is .mzx).
++ Fixed backup_interval for config.txt possibly being broken.
++ Fixed a bug messing up the death board on some old MZX games
+  (like Nick Brick 2)
++ Escaped more things and made displays always in escaped form for
+  certain character sequences. It should be impossible to type
+  non-escaped forms. The following should be used:
+  \0 for 0 (this probably won't work in strings, but in chars should)
+  \t for tab (character 9)
+  \n for newline (character 10)
+  \r for carriage return (character 13)
+  \" for double quote
+  \\ for slash
++ Copy + paste on escaped character won't unescape them anymore.
++ Fixed error message for invalid lines in Robotic
++ Fixed inability to import text files from other directories.
++ Huge overhaul of the source (proper types for things, directions,
+  equalities, conditions, chest items, and potions), if anything is
+  suddenly broken now let me know.
++ Made scrolls/signs only display text (letters, numbers, etc) in the
+  default char set. That should be enough for now.
++ Added mousewheel support for robot editor and robot box display.
++ Fixed inability to load MZMs from other directories in the editor.
++ Wrapped audio stuff in proper mutex, hopefully this fixes some issues
+  (like crashing when changing mod_frequency a lot).
++ Long current directory paths no longer write out too much in the file
+  loader (instead the last bit is shown with a ... prefixing the
+  beginning)
++ Decided to be nice and make board_scan not crash. Don't use it. It's
+  only there to make one legacy game work. If you use it I will
+  personally scold you. And don't tell other people to use it (that
+  means you CJA). Use copy block x y w h "$str" t instead. If you don't
+  know what that means read the help file, it explains everything.
++ Removed ability to copy + paste after changing board dimensions of the
+  source under any circumstances (alt + R, alt + Z, import world, import
+  board)
++ Fixed appearance of ghosts in F10 menu.
++ Prevented char editor from counting moving the cursor as an undo step
+  if nothing was actually drawn.
++ Made pressing escape on initial char selection/board selection/param
+  selection for things cause it to cancel placing anything.
++ Made it impossible to set board width/height to 0 again (oops)
++ Made starting lives and starting health take effect immediately for
+  the first alt + t
++ Added ability to play OGG from alt + l (but not the other mods, don't
+  want to clutter that up)
++ Made it so if no note follows an embedded SAM in a play string it's
+  played at native frequency.
++ Accidentally made loading worlds in the editor not change the current
+  directory, fixed that.
+
 November 20, 2005 - MZX 2.81
 
 + Fixed a bug where MZX world/save names > 12 chars could cause weird

package.sh

@@ -4,14 +4,84 @@
 #
 ################################################################################
 
+function usage {
+	echo "usage: $0 [-b win32 | macos | linux-i686 | linux-amd64]"
+	echo
+	echo "	-b	Builds a binary distribution for the specified arch."
+	echo "	-h	Displays this help text."
+	exit 0
+}
+
+#
+# createzip /path/to/SDL.dll
+#
+function createzip {
+	#
+	# Copy SDL here temporarily.
+	#
+	cp -f $1 SDL.dll &&
+
+	#
+	# Create the binary package.
+	#
+	7za.exe a -tzip dist/$TARGET.zip \
+		$BINARY_DEPS $DOCS $TARGET.exe SDL.dll &&
+
+	#
+	# Remove SDL.
+	#
+	rm -f SDL.dll
+}
+
+#
+# createtbz tar-name-ext [extra-binary]
+#
+function createtbz {
+	#
+	# create temporary directory
+	#
+	mkdir -p dist/$TARGET/docs &&
+
+	#
+	# copy binaries into it
+	#
+	cp -f --dereference $BINARY_DEPS $TARGET $2 dist/$TARGET &&
+
+	#
+	# copy docs over
+	#
+	cp -f --dereference $DOCS dist/$TARGET/docs &&
+
+	#
+	# tar it up
+	#
+	tar -C dist -jcvf dist/$TARGET-$1.tar.bz2 $TARGET &&
+
+	#
+	# now delete temporary dir
+	#
+	rm -rf dist/$TARGET
+}
+
+#
+# in case of error; breakout CODE
+#
+function breakout {
+	echo "Error $1 occured during packaging, aborted."
+	exit $1
+}
+
 #
 # The basename for the source and binary packages.
 #
 TARGET=`cat Makefile.in | grep TARGET | cut -d " " -f6`
 
 if [ "$TARGET" == "" ]; then
-	echo Could not determine version!
-	exit 1
+	breakout 1
+fi
+
+if [ "$1" == "-h" ]; then
+	usage
 fi
 
 #
@@ -26,12 +96,7 @@ BINARY_DEPS="smzx.pal mzx_ascii.chr mzx_blank.chr mzx_default.chr \
 #
 # Documents that the binary zip should contain (pathname will be stored too).
 #
-DOCS="docs/COPYING.doc docs/changelog.txt docs/port.txt docs/macro.txt"
-
-#
-# Hack for windows
-#
-SDL="/usr/lib/SDL.dll"
+DOCS="docs/COPYING.DOC docs/changelog.txt docs/port.txt docs/macro.txt"
 
 #
 # MegaZeux's build system dependencies; these are packaged in
@@ -50,20 +115,21 @@ SUBDIRS="arch contrib docs"
 #
 SRC="src/*.cpp src/*.h src/Makefile"
 
-echo Generating sources in $TARGET and binary package with $TARGET.exe..
-
 #
 # Do source package.
 #
 ################################################################################
 
-echo Collating sources..
+echo "Generating source package for $TARGET.."
 
-if [ -e dist/$TARGET ]; then
-	rm -rf dist/$TARGET
+#
+# dist cannot safely exist prior to starting.
+#
+if [ -d dist ]; then
+	echo "Destroying dist/.."
+	rm -rf dist
 fi
 
-mkdir -p dist/$TARGET &&
 mkdir -p dist/$TARGET/src &&
 cp -pv $BINARY_DEPS $BUILD_DEPS dist/$TARGET &&
 cp -pvr $SUBDIRS dist/$TARGET &&
@@ -77,30 +143,30 @@ rm -f dist/$TARGET/contrib/libmodplug/src/{*.a,*.o} &&
 cp dist/$TARGET/arch/Makefile.dist dist/$TARGET/Makefile.platform
 
 if [ "$?" != "0" ]; then
-	echo Some error occured during source build, aborted.
-	exit 2
+	breakout 2
 fi
 
 rm -f dist/$TARGET/src/config.h
 
-echo Creating source tar ${TARGET}src.tar.gz..
+echo "Creating source (${TARGET}src.tar.bz2).."
 
 cd dist
 tar --exclude CVS -jcvf ${TARGET}src.tar.bz2 $TARGET
 cd ..
 
 if [ "$?" != "0" ]; then
-	echo Some error occured during packaging, aborted.
-	exit 3
+	breakout 3
 fi
 
 rm -rf dist/$TARGET
 
 echo Built source distribution successfully!
 
-
+#
 # no binary package is required
+#
 if [ "$1" != "-b" ]; then
+	echo "Skipping binary package build."
 	exit 0
 fi
 
@@ -109,23 +175,50 @@ fi
 #
 ################################################################################
 
+echo "Generating binary package for $2.."
+
 #
-# Remove destination, a 7zip bug means that preexisting files get updated
-# implicitly.
+# Windows, using ZIP compression via 7ZIP compressor
 #
-if [ -e dist/$TARGET.zip ]; then
-	rm -f dist/$TARGET.zip
+if [ "$2" = "win32" ]; then
+	LIBSDL="/usr/lib/SDL.dll"		# Exo's mingw install
+	createzip $LIBSDL
+	exit
 fi
 
 #
-# Create the binary package.
+# MacOS X, using tar.bz2 compression.
 #
-7za.exe a -tzip dist/$TARGET.zip $BINARY_DEPS $DOCS $TARGET.exe
+if [ "$2" = "macos" ]; then
+	LIBSDL="~/dev/lib/libSDL-1.2.0.dylib"	# burst or beige's mac
+	createtbz osx-ppc $LIBSDL
+	exit
+fi
+
+#
+# NOTE: THE LINUX BUILDS SHOULD HAVE STDC++ STATICALLY LINKED!
+# NOTE: THEY MUST ALSO HAVE RELATIVE DIRECTORY LOOKUPS ENABLED!
+#
+
+#
+# Linux/i686, using tar.bz2 compression (NO SDL)
+#
+if [ "$2" = "linux-i686" ]; then
+	createtbz linux-i686
+	exit
+fi
+
+#
+# Linux/amd64, using tar.bz2 compression (NO SDL)
+#
+if [ "$2" = "linux-amd64" ]; then
+	createtbz linux-amd64
+	exit
+fi
 
 #
-# Hack for SDL inclusion (we don't want to store pathname, and 7zip is too
-# lame to have a flag for it).
+# Unknown binary arch
 #
-cp -f $SDL .
-7za.exe u -tzip dist/$TARGET.zip SDL.dll
-rm -f SDL.dll
+echo "Unknown binary architecture.."
+echo
+usage