From: sparky4 Date: Tue, 30 Jun 2015 16:58:13 +0000 (-0500) Subject: made one make file!! yay! X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=8b0bb4c958df11e844f73c6fc41de3e7d8bbbbe3;p=16.git made one make file!! yay! modified: 16.exe modified: exmmtest.exe modified: fmemtest.exe modified: inputest.exe modified: makefile deleted: makefile.gnu modified: maptest.exe modified: palettec.exe modified: pcxtest.exe modified: test.exe modified: test2.exe deleted: wmakegnu.sh --- diff --git a/16.exe b/16.exe index cdf2d4fc..bb8b419c 100644 Binary files a/16.exe and b/16.exe differ diff --git a/exmmtest.exe b/exmmtest.exe index 3306249c..d2c3d92f 100644 Binary files a/exmmtest.exe and b/exmmtest.exe differ diff --git a/fmemtest.exe b/fmemtest.exe index f74dc944..f1730e8e 100644 Binary files a/fmemtest.exe and b/fmemtest.exe differ diff --git a/inputest.exe b/inputest.exe index f483a62d..5959b1ca 100644 Binary files a/inputest.exe and b/inputest.exe differ diff --git a/makefile b/makefile index 8711574a..2d65a108 100644 --- a/makefile +++ b/makefile @@ -1,3 +1,13 @@ +!ifdef __LINUX__ +REMOVECOMMAND=rm +DIRSEP=/ +OBJ=o +!else +REMOVECOMMAND=del +DIRSEP=\ +OBJ=obj +!endif +TARGET_OS = dos #-zk0u = translate kanji to unicode... wwww #-zk0 = kanji support~ #-zkl = current codepage @@ -6,9 +16,6 @@ CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+ FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) -REMOVECOMMAND=del -DIRSEP=\ -OBJ=obj SRC=src$(DIRSEP) SRCLIB=$(SRC)lib$(DIRSEP) JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) @@ -174,3 +181,4 @@ clean: .symbolic @$(REMOVECOMMAND) __WCL__.LNK # @$(REMOVECOMMAND) *.smp @$(REMOVECOMMAND) *.SMP + diff --git a/makefile.gnu b/makefile.gnu deleted file mode 100644 index ab167e25..00000000 --- a/makefile.gnu +++ /dev/null @@ -1,176 +0,0 @@ -#-zk0u = translate kanji to unicode... wwww -#-zk0 = kanji support~ -#-zkl = current codepage - -#MFLAGS=-mc# -zm -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 -DIRSEP=/ -OBJ=o -SRC=src$(DIRSEP) -SRCLIB=$(SRC)lib$(DIRSEP) -JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) -EXMMLIB=$(SRCLIB)exmm$(DIRSEP) -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 palettec.exe maptest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe - -# -#executables -# -16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib - wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib - -scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ) - wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ) -scroll.$(OBJ): $(SRC)scroll.c - wcl $(FLAGS) -c $(SRC)scroll.c -test.exe: test.$(OBJ) 16.lib - wcl $(FLAGS) test.$(OBJ) 16.lib - -test2.exe: test2.$(OBJ) 16.lib - wcl $(FLAGS) test2.$(OBJ) 16.lib - -fonttest.exe: fonttest.$(OBJ) 16.lib - wcl $(FLAGS) fonttest.$(OBJ) 16.lib - -inputest.exe: inputest.$(OBJ) 16.lib - wcl $(FLAGS) inputest.$(OBJ) 16.lib - -pcxtest.exe: pcxtest.$(OBJ) 16.lib - wcl $(FLAGS) pcxtest.$(OBJ) 16.lib - -palettec.exe: palettec.$(OBJ) modex16.$(OBJ) - wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ) - -maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib - wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib - -#maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib -# wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib - -#emmtest.exe: emmtest.$(OBJ) memory.$(OBJ) -# wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ) - -#emsdump.exe: emsdump.$(OBJ) memory.$(OBJ) -# wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ) - -fmemtest.exe: fmemtest.$(OBJ) - wcl $(FLAGS) fmemtest.$(OBJ) - -exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ) - wcl $(FLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ) - -# -#executable's objects -# -16.$(OBJ): $(SRC)16.h $(SRC)16.c - wcl $(FLAGS) -c $(SRC)16.c - -test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h - wcl $(FLAGS) -c $(SRC)test.c - -test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h - wcl $(FLAGS) -c $(SRC)test2.c - -pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h - wcl $(FLAGS) -c $(SRC)pcxtest.c - -palettec.$(OBJ): $(SRC)palettec.c - wcl $(FLAGS) -c $(SRC)palettec.c - -maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h - wcl $(FLAGS) -c $(SRC)maptest.c - -#maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h -# wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c - -#emmtest.$(OBJ): $(SRC)emmtest.c -# wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c - -#emsdump.$(OBJ): $(SRC)emsdump.c -# wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c - -fmemtest.$(OBJ): $(SRC)fmemtest.c - wcl $(FLAGS) -c $(SRC)fmemtest.c - -fonttest.$(OBJ): $(SRC)fonttest.c - wcl -c $(SRC)fonttest.c - -inputest.$(OBJ): $(SRC)inputest.c - wcl $(FLAGS) -c $(SRC)inputest.c - -exmmtest.$(OBJ): $(SRC)exmmtest.c - wcl $(FLAGS) -c $(SRC)exmmtest.c - -# -#non executable objects libraries -# -16.lib: $(16LIBOBJS) gfx.lib - wlib -b 16.lib $(16LIBOBJS) gfx.lib - -gfx.lib: $(GFXLIBOBJS) - wlib -b gfx.lib $(GFXLIBOBJS) - -modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c - wcl $(FLAGS) -c $(SRCLIB)modex16.c - -#dos_kb.$(OBJ): $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c -# wcl $(FLAGS) -c $(SRCLIB)dos_kb.c - -bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c - wcl $(FLAGS) -c $(SRCLIB)bitmap.c - -planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c - wcl $(FLAGS) -c $(SRCLIB)planar.c - -scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c - wcl $(FLAGS) -c $(SRCLIB)scroll16.c - -wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c - wcl $(FLAGS) -c $(WCPULIB)wcpu.c - -16text.$(OBJ): $(SRCLIB)16text.c - wcl -c $(SRCLIB)16text.c - -mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib - wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib - -#fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib -# wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib - -16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c - wcl $(FLAGS) -c $(SRCLIB)16_in.c - -16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c - wcl $(FLAGS) -c $(SRCLIB)16_mm.c - -lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c - wcl $(FLAGS) -c $(SRCLIB)lib_head.c - -jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c - wcl $(FLAGS) -c $(JSMNLIB)jsmn.c - -#farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c -# wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c - -#memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c -# wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c - -# -#other~ -# -clean: .symbolic - @$(REMOVECOMMAND) *.$(OBJ) -# @$(REMOVECOMMAND) *.OBJ -# @$(REMOVECOMMAND) *.out -# @$(REMOVECOMMAND) *.OUT - @$(REMOVECOMMAND) makefi~1 - @$(REMOVECOMMAND) __WCL__.LNK -# @$(REMOVECOMMAND) *.smp - @$(REMOVECOMMAND) *.SMP diff --git a/maptest.exe b/maptest.exe index ed045368..30bb5541 100644 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/palettec.exe b/palettec.exe index 1df956b8..c577b353 100644 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/pcxtest.exe b/pcxtest.exe index c1ec6d87..48678f39 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/test.exe b/test.exe index 754df675..972f9973 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index 53173f24..51b7b74e 100644 Binary files a/test2.exe and b/test2.exe differ diff --git a/wmakegnu.sh b/wmakegnu.sh deleted file mode 100644 index 77563ae9..00000000 --- a/wmakegnu.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -wmake -f makefile.gnu