From: sparky4 Date: Mon, 29 Jun 2015 18:53:28 +0000 (-0500) Subject: moved to model compact~ X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=a4facf06a902997ce6d588e8518822cc407b62d8;p=16.git moved to model compact~ modified: 16.exe modified: inputest.exe modified: makefile modified: makefile.gnu modified: maptest.exe modified: palettec.exe modified: pcxtest.exe modified: src/test.c modified: test.exe modified: test2.exe --- diff --git a/16.exe b/16.exe index bb8b419c..cdf2d4fc 100644 Binary files a/16.exe and b/16.exe differ diff --git a/inputest.exe b/inputest.exe index e48d05c4..f483a62d 100644 Binary files a/inputest.exe and b/inputest.exe differ diff --git a/makefile b/makefile index 0562cef2..0af5c1d3 100644 --- a/makefile +++ b/makefile @@ -18,7 +18,7 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP) 16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ) GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) -all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe +all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe # #executables @@ -166,8 +166,8 @@ memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c #other~ # clean: .symbolic -# @$(REMOVECOMMAND) *.$(OBJ) - @$(REMOVECOMMAND) *.OBJ + @$(REMOVECOMMAND) *.$(OBJ) +# @$(REMOVECOMMAND) *.OBJ # @$(REMOVECOMMAND) *.out # @$(REMOVECOMMAND) *.OUT @$(REMOVECOMMAND) makefi~1 diff --git a/makefile.gnu b/makefile.gnu index f86934a9..3beab28e 100644 --- a/makefile.gnu +++ b/makefile.gnu @@ -3,7 +3,7 @@ #-zkl = current codepage MFLAGS=-mh# -zm -CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq +CFLAGS=-zkl -wo -x -mc# -zdp# -zp16 -zq OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+ FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) REMOVECOMMAND=rm @@ -18,7 +18,7 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP) 16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ) GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) -all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe +all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe # #executables @@ -166,8 +166,8 @@ memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c #other~ # clean: .symbolic -# @$(REMOVECOMMAND) *.$(OBJ) - @$(REMOVECOMMAND) *.OBJ + @$(REMOVECOMMAND) *.$(OBJ) +# @$(REMOVECOMMAND) *.OBJ # @$(REMOVECOMMAND) *.out # @$(REMOVECOMMAND) *.OUT @$(REMOVECOMMAND) makefi~1 diff --git a/maptest.exe b/maptest.exe index 30bb5541..ed045368 100644 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/palettec.exe b/palettec.exe index c577b353..1df956b8 100644 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/pcxtest.exe b/pcxtest.exe index 48678f39..c1ec6d87 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/src/test.c b/src/test.c index 99a2f9f1..a34ed407 100644 --- a/src/test.c +++ b/src/test.c @@ -32,7 +32,7 @@ void main() { byte *pal, *pal2=NULL; /* load our palette */ - modexLoadPalFile("gfx.pal", &pal2); + modexLoadPalFile("data/default.pal", &pal2); /* save the palette */ pal = modexNewPal(); diff --git a/test.exe b/test.exe index c6f91f2d..754df675 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index 51b7b74e..53173f24 100644 Binary files a/test2.exe and b/test2.exe differ