to_os_path=/=\
REMOVECOMMAND=del
COPYCOMMAND=copy /y
-MOVECOMMAND=move
+MOVECOMMAND=move /y
DIRSEP=\
OBJ=obj
DUMP=type
-DOSLIBMAKE=.\make.bat
-DOSLIBMAKEALL=.\build.bat
+DOSLIBMAKE=make.bat build all
+DOSLIBMAKEALL=buildall.bat build all
!endif
TARGET_OS = dos
DATADIR=data/
SPRI=$(DATADIR)/spri
SRC=src
-UTIL=$(SRC)/util
+UTIL=$(SRC)$(DIRSEP)util
GITCONFIGDIR=$(UTIL)/git
-SCRIPTBATDIR=$(UTIL)/shbat
+SCRIPTBATDIR=$(UTIL)$(DIRSEP)shbat
SRCLIB=$(SRC)/lib
JSMNLIB=$(SRCLIB)/jsmn
NYANLIB=$(SRCLIB)/nyan
# List of executables to build
#
EXTERNTESTEXEC = &
- joytest.exe &
wcpu.exe &
db.exe
TESTEXEC = &
ps.exe
# fd-dbg.exe
!ifdef __LINUX__
+DOSLIBTESTEXEC = &
+ joytest.exe &
+ opltest.exe
SPRIUTILEXEC = &
pcx2vrl &
pcxsscut &
bakapi.exe &
$(TESTEXEC) &
$(UTILEXEC) &
- opltest.exe
+ $(DOSLIBTESTEXEC)
-#!ifdef __LINUX__
-#EXEC += $(SPRIUTILEXEC)
-#!endif
+!ifdef __LINUX__
+#++?EXEC += $(SPRIUTILEXEC)
+#EXEC += $(DOSLIBTESTEXEC)
+!endif
ALLEXEC = &
$(EXEC) &
palettec.exe: palettec.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
palettel.exe: palettel.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
palbomb.exe: palbomb.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib $(DOSLIB)
+pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
#planrpcx.exe: planrpcx.$(OBJ) gfx.lib
maptest.exe: maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
fmemtest.exe: fmemtest.$(OBJ)
psltest.$(OBJ): $(SRC)/paltest.c $(SRCLIB)/16_vl.h
#test2.$(OBJ): $(SRC)/test2.c $(SRCLIB)/16_vl.h
test0.$(OBJ): $(SRC)/test0.c
-pcxtest.$(OBJ):$(SRC)/pcxtest.c $(SRCLIB)/16_vl.h
-vrstest.$(OBJ):$(SRC)/vrstest.c $(SRCLIB)/16_vl.h
-#vgacamm.$(OBJ):$(SRC)/vgacamm.c $(SRCLIB)/16_vl.h
+pcxtest.$(OBJ): $(SRC)/pcxtest.c $(SRCLIB)/16_vl.h
+vrstest.$(OBJ): $(SRC)/vrstest.c $(SRCLIB)/16_vl.h
+#vgacamm.$(OBJ): $(SRC)/vgacamm.c $(SRCLIB)/16_vl.h
#planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/16_vl.h
-pcxtest2.$(OBJ):$(SRC)/pcxtest2.c $(SRCLIB)/16_vl.h
+pcxtest2.$(OBJ): $(SRC)/pcxtest2.c $(SRCLIB)/16_vl.h
palettec.$(OBJ): $(SRC)/palettec.c
palettel.$(OBJ): $(SRC)/palettel.c
palbomb.$(OBJ): $(SRC)/palbomb.c
-maptest.$(OBJ):$(SRC)/maptest.c $(SRCLIB)/16_vl.h
-#emmtest.$(OBJ):$(SRC)/emmtest.c
-#emsdump.$(OBJ):$(SRC)/emsdump.c
-fmemtest.$(OBJ):$(SRC)/fmemtest.c
-fonttest.$(OBJ):$(SRC)/fonttest.c
+maptest.$(OBJ): $(SRC)/maptest.c $(SRCLIB)/16_vl.h
+#emmtest.$(OBJ): $(SRC)/emmtest.c
+#emsdump.$(OBJ): $(SRC)/emsdump.c
+fmemtest.$(OBJ): $(SRC)/fmemtest.c
+fonttest.$(OBJ): $(SRC)/fonttest.c
#fonttes0.$(OBJ): $(SRC)/fonttes0.c
-fontgfx.$(OBJ):$(SRC)/fontgfx.c
-inputest.$(OBJ):$(SRC)/inputest.c
-#inntest.$(OBJ):$(SRC)/inntest.c
+fontgfx.$(OBJ): $(SRC)/fontgfx.c
+inputest.$(OBJ): $(SRC)/inputest.c
+#inntest.$(OBJ): $(SRC)/inntest.c
sountest.$(OBJ): $(SRC)/sountest.c
sdtest.$(OBJ): $(SRC)/sdtest.c
imfplay.$(OBJ): $(SRC)/imfplay.c
vrldbg.$(OBJ): $(SRC)/vrldbg.c
#miditest.$(OBJ): $(SRC)/miditest.c
-#testemm.$(OBJ):$(SRC)/testemm.c
+#testemm.$(OBJ): $(SRC)/testemm.c
#testemm0.$(OBJ): $(SRC)/testemm0.c
#tsthimem.$(OBJ): $(SRC)/tsthimem.c
-exmmtest.$(OBJ):$(SRC)/exmmtest.c
-vgmtest.$(OBJ):$(SRC)/vgmtest.c
+exmmtest.$(OBJ): $(SRC)/exmmtest.c
+vgmtest.$(OBJ): $(SRC)/vgmtest.c
db.$(OBJ): $(UTIL)/db.c
ps.$(OBJ): $(SRC)/ps.c
fd-dbg.$(OBJ): $(SRC)/fd-dbg.c
@if exist *.EXE $(REMOVECOMMAND) *.EXE
@if exist *.OBJ $(REMOVECOMMAND) *.OBJ
#@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f
- @if not exist vrl2vrs wmake -s -h pcx2vrl
+ @if not exist vrl2vrs wmake -s -h vrl2vrs
+ @if not exist pcx2vrl wmake -s -h pcx2vrl
+ #@if not exist png2vrl wmake -s -h png2vrl
@if not exist dro2imf wmake -s -h drotoimf
@if not exist raw2vgm wmake -s -h vgmtools
!else
backupscript: .symbolic
@$(COPYCOMMAND) WBUILD.BAT WBUILD.B
- @$(COPYCOMMAND) wbuild.sh wbuild.s
@if exist *.bat $(MOVECOMMAND) *.bat $(SCRIPTBATDIR)/
- @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
@$(MOVECOMMAND) WBUILD.B WBUILD.BAT
- @$(MOVECOMMAND) wbuild.s wbuild.sh
+
!ifdef __LINUX__
+ @$(COPYCOMMAND) wbuild.sh wbuild.s
+ @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
+ @$(MOVECOMMAND) wbuild.s wbuild.sh
+
@if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/
- @if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh ./
+ @if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh .
!endif
- @if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh ./
- @if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT ./
+ @if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh .
+ @if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT .
initscript: .symbolic
- @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.bat ./
- @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.sh ./
+ @$(COPYCOMMAND) $(SCRIPTBATDIR)$(DIRSEP)*.bat .
!ifdef __LINUX__
- @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT ./
+ @$(COPYCOMMAND) $(SCRIPTBATDIR)$(DIRSEP)*.sh .
+ @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT .
!endif
comp: .symbolic
- @*upx -9 $(EXEC)
+ @wmake -s -h exe2e
+ @*upx -9 *.exe#$(EXEC)
+ @wmake -s -h e2exe
comq: .symbolic
- @*upx -9 $(UPXQ) $(EXEC)
+ @wmake -s -h exe2e
+ @*upx -9 $(UPXQ) *.exe#$(EXEC)
+ @wmake -s -h e2exe
+
+exe2e: .symbolic
+ @for %f in ($(ALLEXEC)) do @if exist %f $(MOVECOMMAND) %f $(SRCLIB)
+!ifdef __LINUX__
+ @if exist *.EXE ./make-lowercase *.EXE
+!endif
+ @if exist *.exe $(MOVECOMMAND) *.exe $(SRC)
+ @if exist $(SRCLIB)/*.exe $(MOVECOMMAND) $(SRCLIB)/*.exe .
+
+e2exe: .symbolic
+ @if exist $(SRC)/*.exe $(MOVECOMMAND) $(SRC)/*.exe .
www: .symbolic
@if exist 16.exe @wmake -s -h wwwdo
$(SPRIUTILEXEC):
@cd $(DOSLIB_VGA:$(to_os_path))
#@make clean
- @make all
+ ####@make all
+ @make pcx2vrl
+ @make vrl2vrs
+ @for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#/
+ @cd $(BUILD_ROOT)
+
+png2vrl: .symbolic
+ @cd $(DOSLIB_VGA:$(to_os_path))
+ #@make clean
+ @make png2vrl
@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#/
@cd $(BUILD_ROOT)
!endif
projects / 16.git / blobdiff