X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fld65%2Fmake%2Fwatcom.mak;h=c1f6b04af9588f05dcc08dab53da4193a51e2aa2;hb=3d1ee0f974987bbe27da2710ed40cca6af01403a;hp=fdc16cc8400a73eae8cbca4a655398484fe9ae03;hpb=46a013c312821fd0d3e9fe2fe59e7d0d83da87e3;p=cc65

diff --git a/src/ld65/make/watcom.mak b/src/ld65/make/watcom.mak
index fdc16cc84..c1f6b04af 100644
--- a/src/ld65/make/watcom.mak
+++ b/src/ld65/make/watcom.mak
@@ -10,18 +10,19 @@ 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
-WSTRIP	= $(WINE) WSTRIP
+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
@@ -53,7 +54,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-	$(CC) $(CFLAGS) $^
+	$(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------
@@ -62,6 +63,7 @@ endif
 OBJS =	asserts.obj     \
         bin.obj		\
 	binfmt.obj	\
+        cfgexpr.obj     \
 	condes.obj	\
 	config.obj	\
         dbgfile.obj     \
@@ -70,7 +72,7 @@ OBJS =	asserts.obj     \
 	error.obj	\
 	exports.obj	\
 	expr.obj	\
-	extsyms.obj	\
+	extsyms.obj   	\
 	fileinfo.obj	\
 	fileio.obj	\
         filepath.obj    \
@@ -104,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)
@@ -114,7 +118,7 @@ clean:
 	@rm -f *~ core
 
 zap:	clean
-	@rm -f *.obj $(EXE)
+	@rm -f $(OBJS) $(EXE) $(EXE:.exe=.map)
 
 strip:
 	@-$(WSTRIP) $(EXE)