diff makefile.wpm @ 1407:2f10480d2c8a

More Watcom build fixes from abwillis and a change to allow VAC30 to work again.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 30 Nov 2011 06:00:29 +0000
parents 1d07d7ff07b9
children 6baf177f335c
line wrap: on
line diff
--- a/makefile.wpm	Wed Nov 30 05:37:00 2011 +0000
+++ b/makefile.wpm	Wed Nov 30 06:00:29 2011 +0000
@@ -4,7 +4,7 @@
 #
 #===================================================================
 OS22_H = $(%WATCOM)\h\os2
-CFLAGS  = -i=os2 -i=$(OS22_H) -bt=OS2 -zq -d2 -bd -sg
+CFLAGS  = -i=os2 -i=$(OS22_H) -bm -bt=OS2 -zq -d2 -bd -sg
 TKPATH=C:\Toolkit
 TLKTLIB = $(TKPATH)\LIB
 
@@ -16,28 +16,31 @@
 all:	dw.dll dwcompat.dll dwtest.exe
 
 dwcompat.dll: dirent.obj compat.obj
-	wlink @os2\dwcompat.lnk name dwcompat.dll system os2v2_dll d a library $(TLKTLIB)\so32dll,$(TLKTLIB)\tcp32dll option implib=dwcompat option symf f $[@ f compat
+	wlink @os2\dwcompat.lnk name dwcompat.dll system os2v2_dll d a library $(TLKTLIB)\so32dll,$(TLKTLIB)\tcp32dll option implib=dwcompat option map option symf f $[@ f compat
 	copy dwcompat.lib lib
+        copy dwcompat.dll dll
 
 dirent.obj:
 	wcc386 $(CFLAGS) os2\dirent.c
 
 dw.dll: dw.obj
-	wlink @os2\dw.lnk name dw.dll system os2v2_dll d a option implib=dw option symf f $[@
+	wlink @os2\dw.lnk name dw.dll system os2v2_dll d a option implib=dw option map option symf f $[@
 	copy dw.lib lib
+        copy dw.dll dll
 
 dw.obj: os2\dw.c
 	wcc386 $(CFLAGS) os2\dw.c
 
 dwtest.exe: dwtest.obj
-	wlink name dwtest.exe system os2v2_pm d a library lib\dw.lib option symf f $[@
+	wlink name dwtest.exe system os2v2_pm d a library lib\dw.lib option map option symf f $[@
 
 dwtest.obj:
-	wcc386 /DOS2 -i=os2 -i=$(OS22_H) -bt=OS2 -zq -d2 dwtest.c
+	wcc386 /DOS2 -i=os2 -i=$(OS22_H) -bm -bt=OS2 -zq -d2 -sg dwtest.c
 
 clean:
 	@if exist *.obj del *.obj
 	@if exist *.sym del *.sym
+	@if exist *.map del *.map
 	@if exist *.lib del *.lib
 	@if exist *.dll del *.dll
 	@if exist *.exe del *.exe