changes to watcom makefiles for OpenWatcom

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

contrib/samples/animate/makefile.wat

@@ -6,9 +6,11 @@
 #
 
 WXDIR = $(%WXWIN)
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 
 PROGRAM = anitest
-OBJECTS = $(PROGRAM).obj animate.obj
+EXTRALIBS = $(WXDIR)\lib\anim_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/gizmos/multicell/makefile.wat

@@ -3,9 +3,10 @@
 
 WXDIR = $(%WXWIN)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 PROGRAM = mtest
-OBJECTS = $(PROGRAM).obj ..\src\multicell.obj
-EXTRAINC=-I..\include
+EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/gizmos/splittree/makefile.wat

@@ -1,14 +1,13 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
-# 
-#
+# Purpose: makefile for multicell example (Watcom)
+# Created 2000-07-28
 
 WXDIR = $(%WXWIN)
 
-PROGRAM = minimal
-OBJECTS = $(PROGRAM).obj
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+
+PROGRAM = tree
+EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/mmedia/makefile.wat

@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = mmboard
-OBJECTS = $(PROGRAM).obj mmbman.obj
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj  mmbman.obj
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/ogl/ogledit/makefile.wat

@@ -7,9 +7,11 @@
 
 WXDIR = $(%WXWIN)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+
 PROGRAM = ogledit
-EXTRALIBS = $(WXDIR)\lib\ogl.lib
-OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj
+EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\doc.obj $(OUTPUTDIR)\view.obj $(OUTPUTDIR)\palette.obj
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/ogl/studio/makefile.wat

@@ -7,10 +7,20 @@
 
 WXDIR = $(%WXWIN)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+
 PROGRAM = studio
-EXTRALIBS = $(WXDIR)\lib\ogl.lib
-OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj &
-  mainfrm.obj project.obj dialogs.obj csprint.obj
+EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj &
+  $(OUTPUTDIR)\doc.obj &
+  $(OUTPUTDIR)\shapes.obj &
+  $(OUTPUTDIR)\symbols.obj &
+  $(OUTPUTDIR)\view.obj &
+  $(OUTPUTDIR)\cspalette.obj &
+  $(OUTPUTDIR)\mainfrm.obj &
+  $(OUTPUTDIR)\project.obj &
+  $(OUTPUTDIR)\dialogs.obj &
+  $(OUTPUTDIR)\csprint.obj
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/stc/makefile.wat

@@ -1,17 +1,13 @@
-#
-# Makefile for WATCOM
-#
+# Purpose: makefile for SVG example (Watcom)
+# Created 2000-07-28
 
-
-WXDIR = $(WXWIN)
+WXDIR = $(%WXWIN)
 
 EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-THISDIR = $(WXDIR)\contrib\samples\stc
-OUTPUTDIR = $(THISDIR)\
-
 PROGRAM = stctest
-EXTRALIBS = $(WXDIR)\lib\stc.lib
-OBJECTS = $(PROGRAM).obj 
+EXTRALIBS = $(WXDIR)\lib\stc_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 
+

contrib/samples/svg/makefile.wat

@@ -1,17 +1,13 @@
-#
-# Makefile for WATCOM
-#
-
+# Purpose: makefile for SVG example (Watcom)
+# Created 2000-07-28
 
 WXDIR = $(%WXWIN)
 
 EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-THISDIR = $(WXDIR)\contrib\samples\svg
-OUTPUTDIR = $(THISDIR)\
-
 PROGRAM = svgtest
-EXTRALIBS = $(WXDIR)\lib\svg.lib
-OBJECTS = $(PROGRAM).obj 
+EXTRALIBS = $(WXDIR)\lib\svg_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 
+