Permalink
Browse files

MegaZeux 2.80f release.

  • Loading branch information...
1 parent 837aa5d commit 3d03cf14c5503ffcda701849f568e06e4d2972c3 @ajs1984 committed Aug 11, 2008
Showing with 1,044 additions and 296 deletions.
  1. +2 −2 Makefile.in
  2. +1 −1 arch/Makefile.macos
  3. +4 −0 config.txt
  4. +18 −5 docs/build.txt
  5. +37 −1 docs/changelog.txt
  6. +118 −0 package.sh
  7. +150 −12 src/char_ed.cpp
  8. +2 −0 src/char_ed.h
  9. +7 −0 src/configure.cpp
  10. +1 −0 src/configure.h
  11. +4 −2 src/counter.cpp
  12. +42 −2 src/edit.cpp
  13. +121 −136 src/edit_di.cpp
  14. +0 −1 src/edit_di.h
  15. +2 −2 src/game.cpp
  16. +3 −0 src/intake.cpp
  17. +0 −1 src/main.cpp
  18. +0 −30 src/main.h
  19. +1 −1 src/rasm.cpp
  20. +515 −99 src/robo_ed.cpp
  21. +10 −0 src/robo_ed.h
  22. +6 −1 src/runrobo2.cpp
View
@@ -5,8 +5,8 @@ CC = gcc
CPP = g++
# default target name
-TARGET = mzx280e
-VERSION = 2.80e
+TARGET = mzx280f
+VERSION = 2.80f
# default optimisations
CXXFLAGS = -O2 -funsigned-char -ffast-math -Wall -DMZX_VERSION=\"${VERSION}\"
View
@@ -9,4 +9,4 @@ STRIP = true
INCLUDES = -I${PREFIX}/include -I${PREFIX}/include/SDL
# standard libraries
-LIBS = -L$(PREFIX)/lib -lSDL -lpthread
+LIBS = -L$(PREFIX)/lib -lSDLmain -lSDL -lpthread -framework Cocoa
View
@@ -155,6 +155,10 @@
#robot_editor_default_palette = 0
+# Set to 1 if you want the robot editor to not show the hotkey
+# help and horizontal border by default.
+
+#robot_editor_hide_help = 0
# Backup options
View
@@ -1,3 +1,5 @@
+MZX can currently be built on Windows (9x/2k/XP), Linux, and MacOS X.
+
How to build MegaZeux 2.80+:
First, you need the source for MZX, obviously, which can be found on
@@ -12,19 +14,30 @@ SDL: http://www.libsdl.org/
libmodplug: http://prdownloads.sourceforge.net/modplug-xmms/
-gdm2s3m: http://mzx.bitpack.net/gdm2s3m-1.5-lite.tar.gz
+gdm2s3m: http://mzx.bitpack.net/gdm2s3m-1.5-lite.tar.bz2
(should also show up on other sites soon)
NOTE: As of this writing, libmodplug (version 0.7) has a bug that
doesn't allow it to correctly load 2-channel FT2 saved mods. There
is a patch included to rectify this; you should patch libmodplug
before building if you have this version.
+Now, you need to run the config script config.sh to begin the
+installation process; this is only absolutely necessary on
+non-Windows platforms, but is recommended universally. For Windows you
+can run it in msys's rxvt shell. Run as following:
+
+config.sh <platform> <prefix>
+
+Where platform is win32, linux, or macos and prefix is typically /usr
+(supply the prefix where system directories lib, include, bin, etc
+are located).
+
Now, you need GCC installed and GNU make to actually build. Currently,
-GCC on Windows and Linux are supported. Use Makefile.linux to build on
-Linux, and the vanilla Makefile to build on Windows. As of this writing,
-the only compiler that has been tested on Windows is mingw. I suggest
-anyone who's interested in building on Windows uses it:
+GCC on Windows and Linux are supported. Type make and if you wish to
+install to /${PREFIX}/bin follow it with make install. As of this
+writing, the only compiler that has been tested on Windows is mingw.
+I suggest anyone who's interested in building on Windows uses it:
http://www.mingw.org/
View
@@ -1,3 +1,38 @@
+December 26, 2004 - MZX 2.80f
+
++ Fixed a bug that could cause crashes when auto-quoting params in the robot
+ editor (eg, set x 1 -> set "x" to 1)
++ Fixed a bug that could crash the robot editor if you added a new line prior
+ to the first line of a marked block, then did an action on it.
++ Fixed a bug where clearing the first and only line could cause it to appear
+ as if it hadn't been cleared at all.
++ Unified global and global next parameter setting so that nothing is lost
+ between first/next but information can be cancelled without application.
++ Fixed E/S block markers appearing in the robot editor when they should be
+ off the screen.
++ Left click position in robot editor mysteriously disappeared after having
+ been added somewhere after 2.80d. Readded.
++ Added option to hide the hotkeys help and horizontal border in the robot
+ editor with alt + h. Also added a config.txt option to have it default
+ this way.
++ Search/replace in the robot editor. ctrl + f to find or replace/replace all,
+ ctrl + r to repeat either search or replace (depending the last one you did,
+ if you cancelled this does nothing)
++ The load_game counter sequence was broken; fixed.
++ Hopefully fixed all means of overrunning the current line max length in the
+ robot editor...
++ Fixed robot editor validation not showing every 13th line
++ Fixed aesthetic problem with validation report....
++ Fixed crash with setting message column less than 0.
++ A couple things added for 2.80e mysteriously disappeared in source handling.
+ Readded.
++ Changed max board size prevention to auto resize the lower dimension to the
+ max that can be handled with the higher (ex, 30000x25000 becomes 30000x559)
++ Added floodfill to char editors (alt + f)
++ Added single depth undo to char editors (alt + u)
+
+December 19, 2004 - MZX 2.80e
+
+ Fixed a bug causing problems with static overlay if a non-overlaid sprite
is displayed so it's clipped off the edge of the screen.
+ Fixed a bug in the display of c?x color boxes in the F2 menu in the robot
@@ -57,6 +92,7 @@
+ Alt-enter finally works as block action in the robot editor.
+ Loading a .mzx/.sav from another directory indirectly (via command-line or
robotic) will now actually change the current working directory.
++ Fixed bug that crashed MZX with ctrl + i in the robot editor.
October 9, 2004 - MZX 2.80d
@@ -146,7 +182,7 @@ August 16, 2004 - MZX 2.80c
initialization, greater than board width/height at draw)
+ Fixed direction parsing for move all
+ Fixed bug where creating things on top of the player would use a slot
- for robots/scrolls/signs/sensors instead of just copy to the buffer
+ for robots/scrolls/signs/sensors instead of just copy to the buffer
+ Added ability to use chars as immediates in Robotic commands
(ie, set "$str.0" 'a')
+ Added options to enable oversampling and specify resampling mode in
View
@@ -0,0 +1,118 @@
+#!/bin/sh
+#
+# Because nobody's perfect.. ;-)
+#
+################################################################################
+
+#
+# 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
+fi
+
+#
+# MegaZeux source AND binary distributions depend on these
+# files being here. Update this list carefully; things that
+# are in source but NOT the binary package should be in
+# build deps below.
+#
+BINARY_DEPS="default.spl mzx_ascii.chr mzx_blank.chr mzx_default.chr \
+ mzx_help.fil mzx_smzx.chr config.txt"
+
+#
+# Documents that the binary zip should contain (pathname will be stored too).
+#
+DOCS="docs/COPYING.doc docs/changelog.txt docs/port.txt"
+
+#
+# Hack for windows
+#
+SDL="/usr/lib/SDL.dll"
+
+#
+# MegaZeux's build system dependencies; these are packaged in
+# addition to binary deps above to complete the source package.
+#
+BUILD_DEPS="config.sh Makefile Makefile.in package.sh"
+
+#
+# These directories are purely for source distributions.
+#
+SUBDIRS="arch contrib docs"
+
+#
+# What we actually care about; the complete sources to MegaZeux. Try to
+# extract crap Exo's left in the wrong place. Feel free to update this.
+#
+SRC="src/*.cpp src/*.h src/makefile"
+
+echo Generating sources in $TARGET and binary package with $TARGET.exe..
+
+#
+# Do source package.
+#
+################################################################################
+
+echo Collating sources..
+
+if [ -e dist/$TARGET ]; then
+ rm -rf dist/$TARGET
+fi
+
+mkdir -p dist/$TARGET &&
+mkdir -p dist/$TARGET/src &&
+cp -pv $BINARY_DEPS $BUILD_DEPS dist/$TARGET &&
+cp -pvr $SUBDIRS dist/$TARGET &&
+cp -pv $SRC dist/$TARGET/src
+
+if [ "$?" != "0" ]; then
+ echo Some error occured during source build, aborted.
+ exit 2
+fi
+
+rm -f dist/$TARGET/src/config.h
+
+echo Creating source tar ${TARGET}src.tar.gz..
+
+cd dist
+tar -zcvf ${TARGET}src.tar.gz $TARGET
+cd ..
+
+if [ "$?" != "0" ]; then
+ echo Some error occured during packaging, aborted.
+ exit 3
+fi
+
+rm -rf dist/$TARGET
+
+echo Built source distribution successfully!
+
+#
+# Do binary package.
+#
+################################################################################
+
+#
+# Remove destination, a 7zip bug means that preexisting files get updated
+# implicitly.
+#
+if [ -e dist/$TARGET.zip ]; then
+ rm -f dist/$TARGET.zip
+fi
+
+#
+# Create the binary package.
+#
+7za.exe a -tzip dist/$TARGET.zip $BINARY_DEPS $DOCS $TARGET.exe
+
+#
+# Hack for SDL inclusion (we don't want to store pathname, and 7zip is too
+# lame to have a flag for it).
+#
+cp -f $SDL .
+7za.exe u -tzip dist/$TARGET.zip SDL.dll
+rm -f SDL.dll
Oops, something went wrong.

0 comments on commit 3d03cf1

Please sign in to comment.