Fixes for the watcom makefiles:

  * Increase the stack size to 64K (instead of 4096). This solves a
    memory overwrite problem with the DOS version.
  * Generate a mapfile, but set it to "ignored" in svn.
  * Be somewhat more specific in zap.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4273 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ar65/make/watcom.mak b/src/ar65/make/watcom.mak
index 2be48e8c895c011fb49b2457e899372b5f0c2346..6d46b6a2c26d4f0dc727ef578aa33cbc269a3c47 100644 (file)
--- a/src/ar65/make/watcom.mak
+++ b/src/ar65/make/watcom.mak
@@ -22,7 +22,7 @@ WSTRIP        = $(WINE) wstrip -q
 LNKCFG  = ld.tmp
 
 # Program arguments
-CFLAGS  = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common
+CFLAGS  = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common
 
 # Target files
 EXE    = ar65.exe
@@ -88,6 +88,8 @@ all:          $(EXE)
 $(EXE):        $(OBJS) $(LIBS)
        @echo "DEBUG ALL" > $(LNKCFG)
        @echo "OPTION QUIET" >> $(LNKCFG)
+       @echo "OPTION MAP" >> $(LNKCFG)
+       @echo "OPTION STACK=65536" >> $(LNKCFG)
        @echo "NAME $@" >> $(LNKCFG)
        @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG)
        @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG)
@@ -98,7 +100,7 @@ clean:
        @rm -f *~ core
 
 zap:   clean
-       @rm -f *.obj $(EXE)
+       @rm -f $(OBJS)$(EXE) $(EXE:.exe=.map)
 
 strip:
        @-$(WSTRIP) $(EXE)

diff --git a/src/ca65/make/watcom.mak b/src/ca65/make/watcom.mak
index 3969c226c3bc1e325c3910e0c1b56047de0206c4..74795cc49ab781ab467a33868c1de671bf89c9f8 100644 (file)
--- a/src/ca65/make/watcom.mak
+++ b/src/ca65/make/watcom.mak
@@ -22,7 +22,7 @@ WSTRIP        = $(WINE) wstrip -q
 LNKCFG  = ld.tmp
 
 # Program arguments
-CFLAGS  = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common
+CFLAGS  = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common
 
 # Target files
 EXE    = ca65.exe
@@ -117,7 +117,9 @@ all:                $(EXE)
 $(EXE):        $(OBJS) $(LIBS)
        @echo "DEBUG ALL" > $(LNKCFG)
        @echo "OPTION QUIET" >> $(LNKCFG)
-       @echo "NAME $@" >> $(LNKCFG)
+       @echo "OPTION MAP" >> $(LNKCFG)
+       @echo "OPTION STACK=65536" >> $(LNKCFG)
+       @echo "NAME $@" >> $(LNKCFG)          
        @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG)
        @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG)
        @$(LD) system $(SYSTEM) @$(LNKCFG)
@@ -127,7 +129,7 @@ clean:
        @rm -f *~ core
 
 zap:   clean
-       @rm -f *.obj $(EXE)
+       @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map)
 
 strip:
        @-$(WSTRIP) $(EXE)

diff --git a/src/cc65/make/watcom.mak b/src/cc65/make/watcom.mak
index b23e54f2794f6b2e602b7dae5119475c50711219..ea83b0e1b08c3d421191a39a4163071b01b78b4f 100644 (file)
--- a/src/cc65/make/watcom.mak
+++ b/src/cc65/make/watcom.mak
@@ -22,7 +22,7 @@ WSTRIP        = $(WINE) wstrip -q
 LNKCFG  = ld.tmp
 
 # Program arguments
-CFLAGS  = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common
+CFLAGS  = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common
 
 # Target files
 EXE    = cc65.exe
@@ -158,6 +158,8 @@ all:                svnversion $(EXE)
 $(EXE):        $(OBJS) $(LIBS)
        @echo "DEBUG ALL" > $(LNKCFG)
        @echo "OPTION QUIET" >> $(LNKCFG)
+       @echo "OPTION MAP" >> $(LNKCFG)
+       @echo "OPTION STACK=65536" >> $(LNKCFG)
        @echo "NAME $@" >> $(LNKCFG)
        @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG)
        @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG)
@@ -177,7 +179,7 @@ clean:
        @rm -f *~ core
 
 zap:   clean
-       @rm -f $(OBJS) $(EXE) svnversion.c
+       @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map) svnversion.c
 
 strip:
        @-$(WSTRIP) $(EXE)

diff --git a/src/cl65/make/watcom.mak b/src/cl65/make/watcom.mak
index 6c59d15f3e0cf8bbfcc738cb038183d2f62d915e..2b7d02ab0fe150b87a9aad72ddfef3544408626d 100644 (file)
--- a/src/cl65/make/watcom.mak
+++ b/src/cl65/make/watcom.mak
@@ -22,7 +22,7 @@ WSTRIP        = $(WINE) wstrip -q
 LNKCFG  = ld.tmp
 
 # Program arguments
-CFLAGS  = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common
+CFLAGS  = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common
 
 # Target files
 EXE    = cl65.exe
@@ -80,6 +80,8 @@ all:          $(EXE)
 $(EXE):        $(OBJS) $(LIBS)
        @echo "DEBUG ALL" > $(LNKCFG)
        @echo "OPTION QUIET" >> $(LNKCFG)
+       @echo "OPTION MAP" >> $(LNKCFG)
+       @echo "OPTION STACK=65536" >> $(LNKCFG)
        @echo "NAME $@" >> $(LNKCFG)
        @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG)
        @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG)
@@ -90,7 +92,7 @@ clean:
        @rm -f *~ core
 
 zap:   clean
-       @rm -f *.obj $(EXE)
+       @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map)
 
 strip:
        @-$(WSTRIP) $(EXE)

diff --git a/src/co65/make/watcom.mak b/src/co65/make/watcom.mak
index 802f0b7b328ef75410bd17ab306784f037bfda89..ffc4e83b2fdafede8c2a64cf502887564a44a327 100644 (file)
--- a/src/co65/make/watcom.mak
+++ b/src/co65/make/watcom.mak
@@ -22,7 +22,7 @@ WSTRIP        = $(WINE) wstrip -q
 LNKCFG  = ld.tmp
 
 # Program arguments
-CFLAGS  = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common
+CFLAGS  = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common
 
 # Target files
 EXE    = co65.exe
@@ -84,6 +84,8 @@ all:          $(EXE)
 $(EXE):        $(OBJS) $(LIBS)
        @echo "DEBUG ALL" > $(LNKCFG)
        @echo "OPTION QUIET" >> $(LNKCFG)
+       @echo "OPTION MAP" >> $(LNKCFG)
+       @echo "OPTION STACK=65536" >> $(LNKCFG)
        @echo "NAME $@" >> $(LNKCFG)
        @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG)
        @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG)
@@ -94,7 +96,7 @@ clean:
        @rm -f *~ core
 
 zap:   clean
-       @rm -f *.obj $(EXE)
+       @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map)
 
 strip:
        @-$(WSTRIP) $(EXE)

diff --git a/src/common/make/watcom.mak b/src/common/make/watcom.mak
index f7a195f8007649b1feb8f3717cbb9140b6e09b02..46efdbacc01eb5918d536ad2d68f449f3df5e6e5 100644 (file)
--- a/src/common/make/watcom.mak
+++ b/src/common/make/watcom.mak
@@ -20,7 +20,7 @@ LD            = $(WINE) wlink
 LIB    = common.lib
 
 # Program arguments
-CFLAGS  = -d1 -onatx -zp4 -5 -zq -w2
+CFLAGS  = -d1 -obeilr -zp4 -5 -zq -w2
 
 # Create NT programs by default
 ifndef TARGET

diff --git a/src/da65/make/watcom.mak b/src/da65/make/watcom.mak
index b4eba8cc14b17f2a4ba09cc1b1868d29318f4081..ee703d93a716b2f63d727712e4d67707e502151f 100644 (file)
--- a/src/da65/make/watcom.mak
+++ b/src/da65/make/watcom.mak
@@ -22,7 +22,7 @@ WSTRIP        = $(WINE) wstrip -q
 LNKCFG  = ld.tmp
 
 # Program arguments
-CFLAGS  = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common
+CFLAGS  = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common
 
 # Target files
 EXE    = da65.exe
@@ -97,6 +97,8 @@ all:          $(EXE)
 $(EXE):        $(OBJS) $(LIBS)
        @echo "DEBUG ALL" > $(LNKCFG)
        @echo "OPTION QUIET" >> $(LNKCFG)
+       @echo "OPTION MAP" >> $(LNKCFG)
+       @echo "OPTION STACK=65536" >> $(LNKCFG)
        @echo "NAME $@" >> $(LNKCFG)
        @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG)
        @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG)
@@ -107,7 +109,7 @@ clean:
        @rm -f *~ core
 
 zap:   clean
-       @rm -f *.obj $(EXE)
+       @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map)
 
 strip:
        @-$(WSTRIP) $(EXE)

diff --git a/src/grc/make/watcom.mak b/src/grc/make/watcom.mak
index 9900820392c094149b5f1ad6efaade8f08bfd123..8895acbc81f16a8c9f4f75fc979474bfee505d45 100644 (file)
--- a/src/grc/make/watcom.mak
+++ b/src/grc/make/watcom.mak
@@ -22,7 +22,7 @@ WSTRIP        = $(WINE) wstrip -q
 LNKCFG  = ld.tmp
 
 # Program arguments
-CFLAGS  = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common
+CFLAGS  = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common
 
 # Target files
 EXE    = grc.exe
@@ -78,6 +78,8 @@ all:          $(EXE)
 $(EXE):        $(OBJS) $(LIBS)
        @echo "DEBUG ALL" > $(LNKCFG)
        @echo "OPTION QUIET" >> $(LNKCFG)
+       @echo "OPTION MAP" >> $(LNKCFG)
+       @echo "OPTION STACK=65536" >> $(LNKCFG)
        @echo "NAME $@" >> $(LNKCFG)
        @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG)
        @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG)
@@ -88,7 +90,7 @@ clean:
        @rm -f *~ core
 
 zap:   clean
-       @rm -f *.obj $(EXE)
+       @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map)
 
 strip:
        @-$(WSTRIP) $(EXE)

diff --git a/src/ld65/make/watcom.mak b/src/ld65/make/watcom.mak
index c9cd98ba12aaa85fbd409781a6e92dbdf9300f92..c1f6b04af9588f05dcc08dab53da4193a51e2aa2 100644 (file)
--- a/src/ld65/make/watcom.mak
+++ b/src/ld65/make/watcom.mak
@@ -22,7 +22,7 @@ WSTRIP        = $(WINE) wstrip -q
 LNKCFG  = ld.tmp
 
 # Program arguments
-CFLAGS  = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common
+CFLAGS  = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common
 
 # Target files
 EXE    = ld65.exe
@@ -72,7 +72,7 @@ OBJS =        asserts.obj     \
        error.obj       \
        exports.obj     \
        expr.obj        \
-       extsyms.obj     \
+       extsyms.obj     \
        fileinfo.obj    \
        fileio.obj      \
         filepath.obj    \
@@ -106,6 +106,8 @@ all:                $(EXE)
 $(EXE):        $(OBJS) $(LIBS)
        @echo "DEBUG ALL" > $(LNKCFG)
        @echo "OPTION QUIET" >> $(LNKCFG)
+       @echo "OPTION MAP" >> $(LNKCFG)
+       @echo "OPTION STACK=65536" >> $(LNKCFG)
        @echo "NAME $@" >> $(LNKCFG)
        @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG)
        @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG)
@@ -116,7 +118,7 @@ clean:
        @rm -f *~ core
 
 zap:   clean
-       @rm -f *.obj $(EXE)
+       @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map)
 
 strip:
        @-$(WSTRIP) $(EXE)

diff --git a/src/od65/make/watcom.mak b/src/od65/make/watcom.mak
index 59055254a667c5185ae3cab00a441908e951ac45..000a8133d410daaa179627f16db83c31e1289365 100644 (file)
--- a/src/od65/make/watcom.mak
+++ b/src/od65/make/watcom.mak
@@ -22,7 +22,7 @@ WSTRIP        = $(WINE) wstrip -q
 LNKCFG  = ld.tmp
 
 # Program arguments
-CFLAGS  = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common
+CFLAGS  = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common
 
 # Target files
 EXE    = od65.exe
@@ -82,6 +82,8 @@ all:          $(EXE)
 $(EXE):        $(OBJS) $(LIBS)
        @echo "DEBUG ALL" > $(LNKCFG)
        @echo "OPTION QUIET" >> $(LNKCFG)
+       @echo "OPTION MAP" >> $(LNKCFG)
+       @echo "OPTION STACK=65536" >> $(LNKCFG)
        @echo "NAME $@" >> $(LNKCFG)
        @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG)
        @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG)
@@ -92,7 +94,7 @@ clean:
        @rm -f *~ core
 
 zap:   clean
-       @rm -f *.obj $(EXE)
+       @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map)
 
 strip:
        @-$(WSTRIP) $(EXE)