Fixes for the watcom makefiles:

[cc65] / src / ld65 / make / watcom.mak

diff --git a/src/ld65/make/watcom.mak b/src/ld65/make/watcom.mak
index 6246441bb498c7fc934cc8f357eaf5520bca8c8a..c1f6b04af9588f05dcc08dab53da4193a51e2aa2 100644 (file)
--- a/src/ld65/make/watcom.mak
+++ b/src/ld65/make/watcom.mak
@@ -14,15 +14,15 @@ export WINEDEBUG=fixme-all
 WINE = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
-WSTRIP = $(WINE) WSTRIP -q
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
+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
@@ -54,7 +54,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------
@@ -63,6 +63,7 @@ endif
 OBJS = asserts.obj     \
         bin.obj                \
        binfmt.obj      \
+        cfgexpr.obj     \
        condes.obj      \
        config.obj      \
         dbgfile.obj     \
@@ -71,7 +72,7 @@ OBJS =        asserts.obj     \
        error.obj       \
        exports.obj     \
        expr.obj        \
-       extsyms.obj     \
+       extsyms.obj     \
        fileinfo.obj    \
        fileio.obj      \
         filepath.obj    \
@@ -105,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)
@@ -115,7 +118,7 @@ clean:
        @rm -f *~ core
 
 zap:   clean
-       @rm -f *.obj $(EXE)
+       @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map)
 
 strip:
        @-$(WSTRIP) $(EXE)