changes to watcom makefiles for OpenWatcom

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/utils/convertrc/makefile.wat

@@ -4,10 +4,17 @@
 #
 
 WXDIR = $(%WXWIN)
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\utils\convertrc
 
 PROGRAM = wxconvert
-EXTRALIBS = $(WXDIR)\lib\wxxrc.lib $(WXDIR)\lib\wxdeprecated.lib
-OBJECTS=convert.obj rc2xml.obj rc2wxr.obj wxr2xml.obj
+EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib $(WXDIR)\lib\wxdeprecated_w.lib
+OBJECTS=&
+    $(OUTPUTDIR)\convert.obj &
+    $(OUTPUTDIR)\rc2xml.obj &
+    $(OUTPUTDIR)\rc2wxr.obj &
+    $(OUTPUTDIR)\wxr2xml.obj
+
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/utils/wxrc/makefile.wat

@@ -4,10 +4,12 @@
 #
 
 WXDIR = $(%WXWIN)
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\utils\wxrc
 
 PROGRAM = wxrc
-EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
-OBJECTS = $(PROGRAM).obj
+EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/utils/wxrcedit/makefile.wat

@@ -4,10 +4,22 @@
 #
 
 WXDIR = $(%WXWIN)
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\utils\wxrcedit
 
 PROGRAM = wxrcedit
-EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
-OBJECTS=edapp.obj editor.obj nodehnd.obj xmlhelpr.obj preview.obj nodesdb.obj pe_basic.obj pe_adv.obj propedit.obj propframe.obj splittree.obj
+EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib
+OBJECTS=$(OUTPUTDIR)\edapp.obj &
+    $(OUTPUTDIR)\editor.obj &
+    $(OUTPUTDIR)\nodehnd.obj &
+    $(OUTPUTDIR)\xmlhelpr.obj &
+    $(OUTPUTDIR)\preview.obj &
+    $(OUTPUTDIR)\nodesdb.obj &
+    $(OUTPUTDIR)\pe_basic.obj &
+    $(OUTPUTDIR)\pe_adv.obj &
+    $(OUTPUTDIR)\propedit.obj &
+    $(OUTPUTDIR)\propframe.obj &
+    $(OUTPUTDIR)\splittree.obj
 
 !include $(WXDIR)\src\makeprog.wat