fixed watcom makefiles to avoid long command lines which wouldn't work

while building in MS-DOS.

diff --git a/.gitignore b/.gitignore
index 27e5618..ced3325 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,6 @@ demo
 *.zip
 data
 *.a
-\r
-/SDL.dll\r
+*.dll
+*.occ
+*.OCC

diff --git a/Makefile b/Makefile
index 3503834..e22c1fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
 baseobj = main.obj
-demoobj = demo.obj screen.obj gfxutil.obj
-scrobj = tunnel.obj fract.obj grise.obj
+demoobj = demo.obj screen.obj gfxutil.obj 3dgfx.obj polyfill.obj
+scrobj = tunnel.obj fract.obj grise.obj polytest.obj
 sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj mouse.obj logger.obj
-obj = $(baseobj) $(demoobj) $(sysobj)
+obj = $(baseobj) $(demoobj) $(sysobj) $(scrobj)
 bin = demo.exe
 
 libs = imago.lib
 
+def = -dM_PI=3.141592653589793
 opt = -5 -fp5 -otexan -oh -oi -ei
 dbg = -d1
 
@@ -22,12 +23,12 @@ AS = nasm
 CC = wcc386
 CXX = wpp386
 ASFLAGS = -fobj
-CFLAGS = $(dbg) $(opt) -zq -bt=dos $(incpath)
+CFLAGS = $(dbg) $(opt) $(def) -zq -bt=dos $(incpath)
 CXXFLAGS = $(CFLAGS)
 LDFLAGS = libpath $(libpath) library { $(libs) }
 LD = wlink
 
-$(bin): $(obj) libs/imago/imago.lib
+$(bin): cflags.occ $(obj) libs/imago/imago.lib
        %write objects.lnk $(obj)
        $(LD) debug all name $@ system dos4g file { @objects } $(LDFLAGS)
 
@@ -35,15 +36,23 @@ $(bin): $(obj) libs/imago/imago.lib
 .cc: src;src/dos
 .asm: src;src/dos
 
+cflags.occ: Makefile
+       %write $@ $(CFLAGS)
+
+cxxflags.occ: Makefile
+       %write $@ $(CXXFLAGS)
+
 .c.obj: .autodepend
-       $(CC) -fo=$@ $(CFLAGS) $[*
+       $(CC) -fo=$@ @cflags.occ $[*
 
 .cc.obj: .autodepend
-       $(CXX) -fo=$@ $(CXXFLAGS) $[*
+       $(CXX) -fo=$@ @cxxflags.occ $[*
 
 .asm.obj:
        $(AS) $(ASFLAGS) -o $@ $[*.asm
 
 clean: .symbolic
        del *.obj
+       del *.occ
+       del *.lnk
        del $(bin)

diff --git a/libs/imago/Makefile b/libs/imago/Makefile
index ada8222..6900d25 100644 (file)
--- a/libs/imago/Makefile
+++ b/libs/imago/Makefile
@@ -25,15 +25,20 @@ def = -DPNG_NO_SNPRINTF
 CC = wcc386
 CFLAGS = $(dbg) $(opt) $(def) -zq -bt=dos -Ilibpng -Izlib -Ijpeglib
 
-$(alib): $(obj)
+$(alib): cflags.occ $(obj)
        %write objects.lbc $(obj)
        wlib -b -n $@ @objects
 
 .c: src;libpng;jpeglib;zlib
 
+cflags.occ: Makefile
+       %write $@ $(CFLAGS)
+
 .c.obj: .autodepend
-       $(CC) -fo=$@ $(CFLAGS) $[*
+       $(CC) -fo=$@ @cflags.occ $[*
 
 clean: .symbolic
        del *.obj
+       del *.occ
+       del *.lbc
        del $(alib)