--- ./src/unix/doc/xmamerc.dist Fri Oct 4 00:02:36 2002
+++ ../xmame-0.61.1/./src/unix/doc/xmamerc.dist Wed Nov 27 11:53:12 2002
@@ -47,8 +47,8 @@
### XFree86 DGA Related ###
### Video Mode Selection Related ###
-keepaspect 1
-displayaspectratio 1.330000
+#keepaspect 1
+#displayaspectratio 1.330000
### X11-input related ###
grabmouse 0
@@ -69,13 +69,17 @@
mouse 1
### Fileio Related ###
-rompath /usr/games/lib/xmame
-spooldir /usr/games/lib/xmame
+rompath /usr/freeware/share/xmame/roms
+samplepath /usr/freeware/share/xmame/samples
+artworkpath /usr/freeware/share/xmame/artwork
+spooldir /usr/freeware/share/xmame/hi
screenshotdir .
-cheatfile /usr/games/lib/xmame/cheat.dat
-hiscorefile /usr/games/lib/xmame/hiscore.dat
-historyfile /usr/games/lib/xmame/history.dat
-mameinfofile /usr/games/lib/xmame/mameinfo.dat
+diffdir /usr/freeware/share/xmame/diff
+ctrlrdir /usr/freeware/share/xmame/ctrlr
+cheatfile /usr/freeware/share/xmame/cheat.dat
+hiscorefile /usr/freeware/share/xmame/hiscore.dat
+historyfile /usr/freeware/share/xmame/history.dat
+mameinfofile /usr/freeware/share/xmame/mameinfo.dat
### Mame Related ###
defaultgame pacman
@@ -82,7 +86,7 @@
language english
fuzzycmp 1
cheat 0
-debug 0
+#debug 0
### Frontend Related ###
clones 1
--- ./src/unix/doc/xmessrc.dist Fri Oct 4 21:19:05 2002
+++ ../xmame-0.61.1/./src/unix/doc/xmessrc.dist Wed Nov 27 11:52:35 2002
@@ -12,7 +12,7 @@
heightscale 1
widthscale 1
autodouble 1
-dirty 1
+#dirty 1
scanlines 0
artwork 1
frameskipper 0
@@ -48,8 +48,8 @@
### XFree86 DGA Related ###
### Video Mode Selection Related ###
-keepaspect 1
-displayaspectratio 1.330000
+#keepaspect 1
+#displayaspectratio 1.330000
### X11-input related ###
grabmouse 0
@@ -70,21 +70,26 @@
mouse 1
### Fileio Related ###
-rompath /usr/games/lib/xmess
-spooldir /usr/games/lib/xmess
+rompath /usr/freeware/share/xmess/roms
+samplepath /usr/freeware/share/xmess/samples
+artworkpath /usr/freeware/share/xmess/artwork
+spooldir /usr/freeware/share/xmess/hi
screenshotdir .
-cheatdir /usr/games/lib/xmess/cheat
-crcdir /usr/games/lib/xmess/crc
+diffdir /usr/freeware/share/xmess/diff
+ctrlrdir /usr/freeware/share/xmess/ctrlr
+cfgname .
+cheatdir /usr/freeware/share/xmess/cheat
+crcdir /usr/freeware/share/xmess/crc
cheatfile cheat.cdb
-hiscorefile /usr/games/lib/xmess/hiscore.dat
-historyfile /usr/games/lib/xmess/history.dat
-mameinfofile /usr/games/lib/xmess/mameinfo.dat
+hiscorefile /usr/freeware/share/xmess/hiscore.dat
+historyfile /usr/freeware/share/xmess/history.dat
+mameinfofile /usr/freeware/share/xmess/mameinfo.dat
### Mess Related ###
language english
fuzzycmp 1
cheat 0
-debug 0
+#debug 0
### Frontend Related ###
clones 1
--- ./src/unix/doc/xmame-doc-8.html Wed Nov 13 23:37:21 2002
+++ ../xmame-0.61.1/./src/unix/doc/xmame-doc-8.html Tue Nov 26 17:52:21 2002
@@ -22,7 +22,7 @@
@@ -35,7 +35,7 @@
-
-The Unix port changelog (changes.unix)
+The Unix port changelog (changes.unix)
- The OpenGL display driver changelog:
changes.opengl or
http://www.jausoft.com/glmame.html
--- ./src/unix/unix.mak Mon Nov 4 22:14:42 2002
+++ ../xmame-0.61.1/./src/unix/unix.mak Wed Nov 27 13:47:22 2002
@@ -283,7 +283,7 @@
objdirs: $(MY_OBJDIRS)
$(MY_OBJDIRS):
- -mkdir $@
+ -mkdir -p $@
xlistdev: src/unix/contrib/tools/xlistdev.c
$(CC_COMMENT) @echo 'Compiling $< ...'
@@ -290,6 +290,10 @@
$(CC_COMPILE) $(CC) $(X11INC) src/unix/contrib/tools/xlistdev.c -o xlistdev $(JSLIB) $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lXi -lm
romcmp: $(OBJ)/romcmp.o $(OBJ)/unzip.o
+ $(CC_COMMENT) @echo Linking $@...
+ $(CC_COMPILE) $(LD) $(LDFLAGS) -o $@ $^ -lz
+
+hdcomp: $(OBJ)/hdcomp.o $(OBJ)/harddisk.o $(OBJ)/md5.o
$(CC_COMMENT) @echo Linking $@...
$(CC_COMPILE) $(LD) $(LDFLAGS) -o $@ $^ -lz
--- ./src/unix/network.c Wed Sep 18 22:30:47 2002
+++ ../xmame-0.61.1/./src/unix/network.c Tue Nov 26 18:31:14 2002
@@ -528,12 +528,14 @@
unsigned char scratch_msg_data[MAX_MSG_LEN];
const char * comparison_string[] = { _truncated_build_version,
PROTOCOL_VERSION,
- Machine->gamedrv->name,
+ NULL,
NULL };
const char * comparison_string_name[] = { "build version",
"protocol version",
"game name" };
unsigned i = 0;
+
+ comparison_string[2] = Machine->gamedrv->name;
fprintf(stderr_file,
"XMame in network Master Mode\n"
--- ./src/unix/contrib/frontends/tkmame.pl Sat Jul 6 02:04:30 2002
+++ ../xmame-0.61.1/./src/unix/contrib/frontends/tkmame.pl Wed Nov 27 10:26:31 2002
@@ -1,13 +1,13 @@
-#!/usr/bin/perl -w
+#!/usr/freeware/bin/perl -w
# set the path to your ROMS below
-my ($MAMEDIR) = "/usr/games/lib/mame/roms";
+my ($MAMEDIR) = "/usr/freeware/share/xmame/roms";
-# set location/name of xmamerc here (typically ~/xmame/) or (/usr/games/lib/mame/)
-my ($XMAMERC_LOC) = "/usr/games/lib/mame/xmamerc";
+# set location/name of xmamerc here (typically ~/xmame/) or (/usr/freeware/share/xmame/)
+my ($XMAMERC_LOC) = "/usr/freeware/share/xmame/xmamerc";
# set name of MAME executable/bin
-my ($MAMEBIN) = "/usr/games/xmame";
+my ($MAMEBIN) = "/usr/freeware/bin/xmame";
my ($ROM,$ROMLIST,$col,$row,$num,$widget,$mw,$table,@ROMLIST,$SWITCH);
--- ./src/unix/contrib/frontends/mamex Sat Jul 6 02:04:30 2002
+++ ../xmame-0.61.1/./src/unix/contrib/frontends/mamex Wed Nov 27 10:27:44 2002
@@ -1,4 +1,4 @@
-#!/usr/bin/wish
+#!/usr/freeware/bin/wish
#
# MAMEX - MAME front End v.2
#
--- ./src/unix/contrib/frontends/mamex.new Sat Jul 6 02:04:30 2002
+++ ../xmame-0.61.1/./src/unix/contrib/frontends/mamex.new Wed Nov 27 10:24:26 2002
@@ -1,4 +1,4 @@
-#!/usr/bin/wish
+#!/usr/freeware/bin/wish
#
# MAMEX - MAME front End v.1.1
#
--- ./src/drivers/bzone.c Wed Sep 11 23:24:29 2002
+++ ../xmame-0.61.1/./src/drivers/bzone.c Tue Nov 26 21:50:07 2002
@@ -208,7 +208,7 @@
#define IN0_VG_HALT (1<<6)
-UINT8 rb_input_select;
+int rb_input_select;
--- ./mess/mess.mak Tue Nov 12 22:17:44 2002
+++ ../xmame-0.61.1/./mess/mess.mak Tue Nov 26 22:16:24 2002
@@ -746,10 +746,10 @@
# additional tools
TOOLS += dat2html$(EXE) \
- tools/mkhdimg$(EXE) \
- tools/imgtool$(EXE) \
- tools/messroms$(EXE) \
- tools/mkimage$(EXE)
+ mkhdimg$(EXE) \
+ imgtool$(EXE) \
+ messroms$(EXE) \
+ mkimage$(EXE)
ifdef MSVC
@@ -762,20 +762,20 @@
@echo Linking $@...
$(LD) $(LDFLAGS) $^ $(LIBS) $(OUTOPT)
-tools/mkhdimg$(EXE): $(OBJ)/mess/tools/mkhdimg/mkhdimg.o
+mkhdimg$(EXE): $(OBJ)/mess/tools/mkhdimg/mkhdimg.o
@echo Linking $@...
$(LD) $(LDFLAGS) $^ $(LIBS) $(OUTOPT)
-tools/mkimage$(EXE): $(OBJ)/mess/tools/mkimage/mkimage.o $(OBJ)/mess/utils.o
+mkimage$(EXE): $(OBJ)/mess/tools/mkimage/mkimage.o $(OBJ)/mess/utils.o
@echo Linking $@...
$(LD) $(LDFLAGS) $^ $(LIBS) $(OUTOPT)
-tools/messroms$(EXE): $(OBJ)/mess/tools/messroms/main.o $(OBJ)/unzip.o
+messroms$(EXE): $(OBJ)/mess/tools/messroms/main.o $(OBJ)/unzip.o
@echo Linking $@...
$(LD) $(LDFLAGS) $^ $(LIBS) $(IMGTOOL_LIBS) $(OUTOPT)
-tools/imgtool$(EXE): \
+imgtool$(EXE): \
$(PLATFORM_IMGTOOL_OBJS) \
$(OBJ)/unzip.o \
$(OBJ)/mess/config.o \
--- ./mess/systems/apf.c Tue Nov 12 22:17:44 2002
+++ ../xmame-0.61.1/./mess/systems/apf.c Tue Nov 26 21:55:08 2002
@@ -137,7 +137,7 @@
/* use bit 3 to identify state of irq from pia 1 */
/* use bit 4 to identify state of irq from video */
-unsigned char apf_ints;
+unsigned int apf_ints;
void apf_update_ints(void)
{