Fixes for the watcom makefiles:

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

diff --git a/src/common/make/watcom.mak b/src/common/make/watcom.mak
index bf27af1e8f0a83cfe9be50c6fa499394a6e67d74..46efdbacc01eb5918d536ad2d68f449f3df5e6e5 100644 (file)
--- a/src/common/make/watcom.mak
+++ b/src/common/make/watcom.mak
@@ -10,16 +10,17 @@ export WATCOM  = c:\\watcom
 export INCLUDE = $(WATCOM)\\h
 
 # We will use the windows compiler under linux (define as empty for windows)
-WINE = wine --
+export WINEDEBUG=fixme-all
+WINE    = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+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
@@ -48,7 +49,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------
@@ -67,8 +68,10 @@ OBJS =       abend.obj       \
        filepos.obj     \
         filetype.obj    \
        fname.obj       \
+        fp.obj          \
        hashstr.obj     \
         hashtab.obj     \
+        intstack.obj    \
         matchpat.obj    \
         mmodel.obj      \
        print.obj       \
@@ -78,9 +81,12 @@ OBJS =       abend.obj       \
         shift.obj       \
        strbuf.obj      \
         strpool.obj     \
+        strstack.obj    \
        strutil.obj     \
        target.obj      \
        tgttrans.obj    \
+        version.obj     \
+        wildargv.obj    \
        xmalloc.obj     \
        xsprintf.obj
 
@@ -97,6 +103,9 @@ $(LIB): $(OBJS)
        $(AR) -q -b -P=32 $(LIB) $(foreach OBJ, $(OBJS), +-$(OBJ))
        @echo Done!
 
+wildargv.obj:
+       $(CC) $(CFLAGS) -fo=$@ $(WATCOM)\\src\\startup\\wildargv.c
+
 clean:
        @rm -f *~ core