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
 
+

contrib/src/applet/makefile

@@ -1,32 +1,27 @@
-#############################################################################
-#
-#                   Copyright (C) 1999 SciTech Software
-#                           All rights reserved.
-#
-# Descripton:   Generic makefile for the SciTech wxApplet library
-#
-#############################################################################
+# Generated automatically from Makefile.in by configure.
+# $Id$
 
-# We are building with the Win32 version
+top_srcdir = ../../..
+top_builddir = ../../..
+libsrc_dir = contrib/src/applet
 
-USE_RTTI		:= 1
-USE_CPPEXCEPT	:= 1
-PRECOMP_HDR		:= wx/wxprec.h
-CFLAGS          += -D__WIN95__ -D__WXMSW__ -D__WINDOWS__
+TARGET_LIBNAME=libwx_msw_applet-2.5
 
-# Link with wxWindows static link libraries or with the DLL. DLL is default.
+LIBVERSION_CURRENT=0
+LIBVERSION_REVISION=0
+LIBVERSION_AGE=0
 
-.IF $(STATIC_LINK)
-.ELSE
-CFLAGS          += -DWXUSINGDLL
-.ENDIF
 
-# Define the library name and objects
+HEADER_PATH=$(top_srcdir)/contrib/include/wx
+HEADER_SUBDIR=applet
 
-LIBFILE         = wxapplet$L
-LIBCLEAN        = *.il? *.dll *.lib
-OBJECTS			:= applet$O appletwindow$O
+HEADERS=applet.h appletwindow.h
 
-DEPEND_OBJ      = $(OBJECTS)
-.INCLUDE: "$(SCITECH)\makedefs\common.mk"
+OBJECTS=applet.o appletwindow.o
+DEPFILES=$(OBJECTS:.o=.d)
 
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+
+include $(top_builddir)/src/makelib.env
+
+-include $(DEPFILES)

contrib/src/gizmos/makefile.wat

@@ -1,24 +1,17 @@
 # Gizmos makefile for Watcom C++
 
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 WXDIR = ..\..\..
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 
-!include $(WXDIR)\src\makewat.env
+LIBTARGET = $(WXDIR)\lib\gizmos_w.lib
 
-GIZMOSLIB = $(WXDIR)\lib\gizmos.lib
-THISDIR = $(WXDIR)\contrib\src\gizmos
-OUTPUTDIR = $(THISDIR)\
+OBJECTS =  &
+    $(OUTPUTDIR)\multicell.obj &
+    $(OUTPUTDIR)\splittree.obj &
+    $(OUTPUTDIR)\editlbox.obj &
+    $(OUTPUTDIR)\dynamicsash.obj &
+    $(OUTPUTDIR)\ledctrl.obj
 
-NAME = gizmos
-LNK = $(name).lnk
+!include $(WXDIR)\src\makelib.wat
 
-OBJECTS =  multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
-
-all: $(GIZMOSLIB) .SYMBOLIC
-
-$(GIZMOSLIB): $(OBJECTS)
-	*wlib /b /c /n /P=256 $(GIZMOSLIB) $(OBJECTS)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(GIZMOSLIB) *.lbc
 

contrib/src/mmedia/makefile.wat

@@ -6,15 +6,33 @@
 #
 # Makefile : Builds MMedia library for Watcom C++, WIN32
 
-WXDIR = $(%WXWIN)
+!error This will not work - there is no digitalv.h in Open Watcom as of 26 Feb 03 
 
-LIBTARGET=$(WXDIR)\contrib\lib\mmedia.lib
+WXDIR = ..\..\..
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 
-OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj &
-  g723_40.obj g72x.obj sndaiff.obj sndbase.obj sndcodec.obj &
-  sndcpcm.obj sndfile.obj sndg72x.obj sndpcm.obj sndulaw.obj &
-  sndwav.obj sndwin.obj vidbase.obj vidwin.obj
+LIBTARGET=$(WXDIR)\lib\mmedia_w.lib
+
+OBJECTS = &
+    $(OUTPUTDIR)\cdbase.obj &
+    $(OUTPUTDIR)\cdwin.obj &
+    $(OUTPUTDIR)\g711.obj &
+    $(OUTPUTDIR)\g721.obj &
+    $(OUTPUTDIR)\g723_24.obj &
+    $(OUTPUTDIR)\g723_40.obj &
+    $(OUTPUTDIR)\g72x.obj &
+    $(OUTPUTDIR)\sndaiff.obj &
+    $(OUTPUTDIR)\sndbase.obj &
+    $(OUTPUTDIR)\sndcodec.obj &
+    $(OUTPUTDIR)\sndcpcm.obj &
+    $(OUTPUTDIR)\sndfile.obj &
+    $(OUTPUTDIR)\sndg72x.obj &
+    $(OUTPUTDIR)\sndpcm.obj &
+    $(OUTPUTDIR)\sndulaw.obj &
+    $(OUTPUTDIR)\sndwav.obj &
+    $(OUTPUTDIR)\sndwin.obj &
+    $(OUTPUTDIR)\vidbase.obj &
+    $(OUTPUTDIR)\vidwin.obj
 
 !include $(WXDIR)\src\makelib.wat
 
-

contrib/src/ogl/makefile.wat

@@ -1,25 +1,24 @@
-# Objects makefile
+# OGL makefile
 
 WXDIR = ..\..\..
 EXTRACPPFLAGS=-I$(WXDIR)\contrib\include;/DPROLOGIO
 
-!include $(WXDIR)\src\makewat.env
+LIBTARGET= $(WXDIR)\lib\ogl_w.lib
 
-OGLLIB = $(WXDIR)\lib\ogl.lib
-THISDIR = $(WXDIR)\contrib\src\ogl
-OUTPUTDIR = $(THISDIR)\
+OBJECTS =  &
+    $(OUTPUTDIR)\basic.obj &
+    $(OUTPUTDIR)\basic2.obj &
+    $(OUTPUTDIR)\canvas.obj &
+    $(OUTPUTDIR)\lines.obj &
+    $(OUTPUTDIR)\divided.obj &
+    $(OUTPUTDIR)\constrnt.obj &
+    $(OUTPUTDIR)\composit.obj &
+    $(OUTPUTDIR)\drawn.obj &
+    $(OUTPUTDIR)\bmpshape.obj &
+    $(OUTPUTDIR)\mfutils.obj &
+    $(OUTPUTDIR)\ogldiag.obj &
+    $(OUTPUTDIR)\oglmisc.obj
 
-NAME = ogl
-LNK = $(name).lnk
 
-OBJECTS =  basic.obj basic2.obj canvas.obj lines.obj divided.obj constrnt.obj &
-    composit.obj drawn.obj bmpshape.obj mfutils.obj ogldiag.obj oglmisc.obj
-
-all: $(OGLLIB) .SYMBOLIC
-
-$(OGLLIB): $(OBJECTS)
-	*wlib /b /c /n /P=256 $(OGLLIB) $(OBJECTS)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(OGLLIB) *.lbc
+!include $(WXDIR)\src\makelib.wat
 

contrib/src/stc/makefile.wat

@@ -10,7 +10,7 @@ EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
 
 !include $(WXDIR)\src\makewat.env
 
-STCLIB = $(WXDIR)\lib\stc.lib
+STCLIB = $(WXDIR)\lib\stc_w.lib
 THISDIR = $(WXDIR)\contrib\src\stc
 OUTPUTDIR = $(THISDIR)\
 

contrib/src/svg/makefile.wat

@@ -1,26 +1,13 @@
-# svg makefile for Watcom C++
+# SVG src makefile for Watcom C++
 
 WXDIR = ..\..\..
 EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 
-!include $(WXDIR)\src\makewat.env
+LIBTARGET = $(WXDIR)\lib\svg_w.lib
 
-SVGLIB = $(WXDIR)\lib\svg.lib
-THISDIR = $(WXDIR)\contrib\src\svg
-OUTPUTDIR = $(THISDIR)\
+OBJECTS =  &
+    $(OUTPUTDIR)\dcsvg.obj &
 
-NAME = svg
-LNK = $(name).lnk
-
-OBJECTS = dcsvg.obj 
+!include $(WXDIR)\src\makelib.wat
 
 
-all:     $(SVGLIB) .SYMBOLIC
-    
-
-$(SVGLIB): $(OBJECTS)
-	*wlib /b /c /n /P=256 $(SVGLIB) $(OBJECTS)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(SVGLIB) *.lbc
-

contrib/src/xrc/makefile.wat

@@ -2,30 +2,51 @@
 
 WXDIR = ..\..\..
 
-EXTRACPPFLAGS=/Id:\libxml\libxml2-2.1.1
+#XMLDIR=
+!error modify makefile.wat to include the path to the XML library
+
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include;-I$(XMLDIR)\libxml2-2.1.1
 
 !include $(WXDIR)\src\makewat.env
 
-WXXMLLIB = $(WXDIR)\lib\wxxrc.lib
-THISDIR = $(WXDIR)\contrib\src\xrc
+LIBTARGET = $(WXDIR)\lib\wxxrc_w.lib
 
-NAME = wxxrc
-LNK = $(name).lnk
-
-OBJECTS=xml.obj xmlres.obj xmlrsall.obj &
-        xh_bttn.obj xh_chckb.obj xh_chckl.obj xh_choic.obj xh_combo.obj xh_dlg.obj &
-        xh_gauge.obj xh_html.obj xh_menu.obj xh_notbk.obj xh_panel.obj xh_radbt.obj &
-        xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj &
-        xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj &
-        xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj &
-        xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj xh_split.obj
-
-
-all: $(WXXMLLIB)
-
-$(WXXMLLIB): $(OBJECTS)
-	*wlib /b /c /n /P=256 $(WXXMLLIB) $(OBJECTS)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(WXXMLLIB) *.lbc
+OBJECTS=&
+    $(OUTPUTDIR)\xml.obj &
+    $(OUTPUTDIR)\xmlres.obj &
+    $(OUTPUTDIR)\xmlrsall.obj &
+    $(OUTPUTDIR)\xh_bttn.obj &
+    $(OUTPUTDIR)\xh_chckb.obj &
+    $(OUTPUTDIR)\xh_chckl.obj &
+    $(OUTPUTDIR)\xh_choic.obj &
+    $(OUTPUTDIR)\xh_combo.obj &
+    $(OUTPUTDIR)\xh_dlg.obj &
+    $(OUTPUTDIR)\xh_gauge.obj &
+    $(OUTPUTDIR)\xh_html.obj &
+    $(OUTPUTDIR)\xh_menu.obj &
+    $(OUTPUTDIR)\xh_notbk.obj &
+    $(OUTPUTDIR)\xh_panel.obj &
+    $(OUTPUTDIR)\xh_radbt.obj &
+    $(OUTPUTDIR)\xh_radbx.obj &
+    $(OUTPUTDIR)\xh_sizer.obj &
+    $(OUTPUTDIR)\xh_slidr.obj &
+    $(OUTPUTDIR)\xh_spin.obj &
+    $(OUTPUTDIR)\xh_stbmp.obj &
+    $(OUTPUTDIR)\xh_sttxt.obj &
+    $(OUTPUTDIR)\xh_text.obj &
+    $(OUTPUTDIR)\xh_listb.obj&
+    $(OUTPUTDIR)\xh_toolb.obj &
+    $(OUTPUTDIR)\xh_stlin.obj &
+    $(OUTPUTDIR)\xh_bmp.obj &
+    $(OUTPUTDIR)\xh_bmpbt.obj &
+    $(OUTPUTDIR)\xh_cald.obj &
+    $(OUTPUTDIR)\xh_listc.obj &
+    $(OUTPUTDIR)\xh_scrol.obj &
+    $(OUTPUTDIR)\xh_stbox.obj &
+    $(OUTPUTDIR)\xh_tree.obj &
+    $(OUTPUTDIR)\xh_unkwn.obj &
+    $(OUTPUTDIR)\xh_frame.obj &
+    $(OUTPUTDIR)\xh_scwin.obj &
+    $(OUTPUTDIR)\xh_split.obj
 
+!include $(WXDIR)\src\makelib.wat

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
 

distrib/msw/tmake/wat.t

@@ -5,6 +5,7 @@
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
 #! Version: $Id$
+#! Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes
@@ -90,6 +91,7 @@ GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTD
 NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
 
 COMMONOBJS = &
+	$(OUTPUTDIR)\y_tab.obj &
 	#$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
 
 MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
@@ -110,7 +112,8 @@ $(ARCHINCDIR)\wx:
 $(OUTPUTDIR):
 	@if not exist $^@ mkdir $^@
 
-$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
+$(SETUP_H): $(ARCHINCDIR)\wx
+    if not exist $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup0.h $(WXDIR)\include\wx\msw\setup.h
 	copy $(WXDIR)\include\wx\msw\setup.h $@
 
 LBCFILE=wx$(TOOLKIT).lbc
@@ -182,6 +185,15 @@ cleanall:   clean
     }
 #$}
 
+$(OUTPUTDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+  *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)

include/wx/msw/private.h

@@ -398,6 +398,9 @@ private:
    DECLARE_NO_COPY_CLASS(SelectInHDC)
 };
 
+#ifdef __WATCOM__
+//FIXME why does watcom dislike this ?? CE 05 April 2003
+
 // when working with global pointers (which is unfortunately still necessary
 // sometimes, e.g. for clipboard) it is important to unlock them exactly as
 // many times as we lock them which just asks for using a "smart lock" class
@@ -437,6 +440,7 @@ private:
     DECLARE_NO_COPY_CLASS(GlobalHandle)
 };
 
+#endif //__WATCOM__
 // ---------------------------------------------------------------------------
 // macros to make casting between WXFOO and FOO a bit easier: the GetFoo()
 // returns Foo cast to the Windows type for oruselves, while GetFooOf() takes

samples/artprov/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = arttest
-OBJECTS = $(PROGRAM).obj artbrows.obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = artprov 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/calendar/makefile.wat

@@ -1,11 +1,12 @@
-# Purpose: makefile for calendar example (Watcom)
-# Created: 2000-01-03
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = calendar
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# 
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = calendar 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/caret/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = caret
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = caret 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/checklst/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = checklst
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = checklst 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/config/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = conftest
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = config 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/console/makefile.wat

@@ -1,9 +1,13 @@
-wxUSE_GUI = 0
-OUTPUTDIR = Watcom\
-
+# 
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+wxUSE_GUI=0
+# 
 PROGRAM = console
-OBJECTS = $(OUTPUTDIR)$(PROGRAM).obj
-
-!include $(%WXWIN)\src\makeprog.wat
-
-
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/controls/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = controls
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = controls 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/db/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = dbtest
-OBJECTS = $(PROGRAM).obj listdb.obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = db 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/dialogs/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = dialogs
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = dialogs 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/dnd/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = dnd
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = dnd 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/docview/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = docview
-OBJECTS = $(PROGRAM).obj view.obj doc.obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = docview 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/docvwmdi/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = docview
-OBJECTS = $(PROGRAM).obj view.obj doc.obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = docvwmdi 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/dragimag/makefile.wat

@@ -1,11 +1,12 @@
-# Purpose: makefile for dragimag example (Watcom)
-# Created: 2000-03-15
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = dragimag
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# 
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = dragimag 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/drawing/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = drawing
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = drawing 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/erase/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = erase
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = erase 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/event/makefile.wat

@@ -1,11 +1,12 @@
-# Purpose: makefile for event example (Watcom)
-# Created: 2001-01-31
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = event
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# 
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = event 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/exec/makefile.wat

@@ -1,11 +1,12 @@
-# Purpose: makefile for exec example (Watcom)
-# Created: 2000-03-14
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = exec
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# 
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = exec 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/font/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = font
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = font 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/grid/makefile.wat

@@ -1,13 +1,12 @@
-#
-# Makefile for WATCOM
-#
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = griddemo
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# 
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = grid 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/help/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = demo
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = help 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/html/about/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = about
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = about 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/html/help/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = help
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = help 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/html/helpview/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = helpview
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = helpview 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/html/printing/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = printing
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = printing 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/html/test/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = test
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = test 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/html/virtual/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = virtual
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = virtual 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/html/widget/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = widget
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = widget 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/html/zip/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = zip
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = zip 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/image/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = image
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = image 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

samples/internat/makefile.wat

@@ -1,15 +1,12 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
 # 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = internat
-OBJECTS = $(PROGRAM).obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = internat 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat