correct minor syntax mistake

[16.git] / makefile

diff --git a/makefile b/makefile
index f4df49f19aa8076fb5bf4a2ae0696400954bbd05..f97dce255774bf9a120a3e31ecafa835e295916e 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -67,8 +67,8 @@ TARGET_OS = dos
 MEMORYMODE = l
 
 BUILD_ROOT=$+$(%__CWD__)$-
-#EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
-DATADIR=data$(DIRSEP)
+#EXMMTESTDIR=16/exmmtest/
+DATADIR=data/
 SPRI=$(DATADIR)/spri
 SRC=src
 UTIL=$(SRC)/util
@@ -193,7 +193,6 @@ LIBMAKERULE=*wlib $(LIBFLAGS) $(extra_$^&_lib_opts)$@ $<
 # List of executables to build
 #
 EXTERNTESTEXEC = &
-       joytest.exe &
        wcpu.exe &
        db.exe
 TESTEXEC = &
@@ -203,7 +202,6 @@ TESTEXEC = &
        vgmtest.exe &
        sountest.exe &
        imfplay.exe &
-       sdtest.exe &
        xcroll.exe &
        0croll.exe &
        1croll.exe &
@@ -214,6 +212,7 @@ TESTEXEC = &
        maptest.exe &
        vrldbg.exe
 #zcroll.exe &
+#sdtest.exe &  //disabled due to fuckery
 TESTEXEC2 = &
        pcxtest.exe &
        scroll.exe &
@@ -231,6 +230,9 @@ UTILEXEC = &
        ps.exe
 #      fd-dbg.exe
 !ifdef __LINUX__
+DOSLIBTESTEXEC = &
+       joytest.exe &
+       opltest.exe
 SPRIUTILEXEC = &
        pcx2vrl &
        pcxsscut &
@@ -248,8 +250,7 @@ EXEC = &
        16.exe &
        bakapi.exe &
        $(TESTEXEC) &
-       $(UTILEXEC) &
-       opltest.exe
+       $(UTILEXEC)
 
 #!ifdef __LINUX__
 #EXEC += $(SPRIUTILEXEC)
@@ -326,33 +327,33 @@ vidtest.$(OBJ):   $(SRC)/vidtest.c        $(SRCLIB)/16_vl.h
 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
@@ -372,33 +373,55 @@ doslib.lib: $(DOSLIBLIBS)
 #
 # library deps 16-bit large
 $(DOSLIB_CPU)/$(DOSLIB_MEMMODE)/cpu.lib:
-       cd $(DOSLIB_CPU:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_CPU:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_DOS)/$(DOSLIB_MEMMODE)/dos.lib:
-       cd $(DOSLIB_DOS:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_DOS:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_VGA)/$(DOSLIB_MEMMODE)/vgatty.lib:
-       cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_VGA:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_VGA)/$(DOSLIB_MEMMODE)/vga.lib:
-       cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_VGA:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_8250)/$(DOSLIB_MEMMODE)/8250.lib:
-       cd $(DOSLIB_8250:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_8250:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_8254)/$(DOSLIB_MEMMODE)/8254.lib:
-       cd $(DOSLIB_8254:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_8254:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_8259)/$(DOSLIB_MEMMODE)/8259.lib:
-       cd $(DOSLIB_8259:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_8259:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_ADLIB)/$(DOSLIB_MEMMODE)/adlib.lib:
-       cd $(DOSLIB_ADLIB:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_ADLIB:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 
 joytest.exe:
-       cd $(DOSLIB_JOYSTICK:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
-       $(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)test.exe joytest.exe
+       cd $(DOSLIB_JOYSTICK:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
+       $(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))/$(DOSLIB_MEMMODE)/test.exe joytest.exe
 
 #imfplay.exe:
-#      cd $(DOSLIB_ADLIB:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
-#      $(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)imfplay.exe imfplay.exe
+#      cd $(DOSLIB_ADLIB:$(to_os_path))
+#      $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+#      cd $(BUILD_ROOT)
+#      $(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))/$(DOSLIB_MEMMODE)/imfplay.exe imfplay.exe
 
 opltest.exe:
-       cd $(DOSLIB_ADLIB:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
-       $(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)test.exe opltest.exe
+       cd $(DOSLIB_ADLIB:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
+       $(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))/$(DOSLIB_MEMMODE)/test.exe opltest.exe
 
 16_vl.$(OBJ):  $(SRCLIB)/16_vl.c       $(SRCLIB)/16_vl.h
 16_vl_1.$(OBJ):        $(SRCLIB)/16_vl_1.c     $(SRCLIB)/16_vl.h
@@ -517,7 +540,7 @@ nuke: .symbolic
        @wmake comp
 
 backupconfig: .symbolic
-       @$(COPYCOMMAND) .git$(DIRSEP)config $(GITCONFIGDIR)/git_con.fig
+       @$(COPYCOMMAND) .git/config $(GITCONFIGDIR)/git_con.fig
        @$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)/git_modu.les
        @$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)/git_igno.re
 
@@ -667,19 +690,19 @@ initshitman: .symbolic
 ##     experimental libs
 ##
 xlib: .symbolic
-       @cd 16$(DIRSEP)xlib
+       @cd 16/xlib
        @wmake -s -h clean
        @wmake -s -h all
        @cd $(BUILD_ROOT)
 
 mx: .symbolic
-       @cd 16$(DIRSEP)xw
+       @cd 16/xw
 #      @wmake clean
        @wmake -s -h all
        @cd $(BUILD_ROOT)
 
 mx_: .symbolic
-       @cd 16$(DIRSEP)xw_
+       @cd 16/xw_
        @wmake -s -h -f makefile all
        @cd $(BUILD_ROOT)
 
@@ -704,6 +727,6 @@ $(SPRIUTILEXEC):
        @cd $(DOSLIB_VGA:$(to_os_path))
        #@make clean
        @make all
-       @for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#$(DIRSEP)
+       @for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#/
        @cd $(BUILD_ROOT)
 !endif