X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ae7eb268cde784d1e6fa0f3edf74af1034bdefa..12f190b09c5c1e25cfd8a6156d8d43f0b6647521:/build/bakefiles/Makefile

diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index 23b68019e5..f3bea2a62a 100644
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -7,9 +7,23 @@ BAKEFILE = bakefile -v
 CDEPS = config.bkl common.bkl common_contrib.bkl
 SDEPS = config.bkl common.bkl common_samples.bkl
 MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
+
+DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \
+           -DUSE_OPENGL=1 -DMONOLITHIC=0 -DUSE_GUI=1 \
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default
 AUTOCONF_ALL = \
-	../../configure \
 	../../Makefile.in \
+	../../contrib/samples/animate/Makefile.in \
+	../../contrib/samples/svg/Makefile.in \
+	../../contrib/samples/xrc/Makefile.in \
+	../../contrib/src/animate/Makefile.in \
+	../../contrib/src/fl/Makefile.in \
+	../../contrib/src/gizmos/Makefile.in \
+	../../contrib/src/ogl/Makefile.in \
+	../../contrib/src/stc/Makefile.in \
+	../../contrib/src/svg/Makefile.in \
+	../../contrib/src/xrc/Makefile.in \
+	../../contrib/utils/wxrc/Makefile.in \
 	../../samples/Makefile.in \
 	../../samples/access/Makefile.in \
 	../../samples/artprov/Makefile.in \
@@ -66,6 +80,7 @@ AUTOCONF_ALL = \
 	../../samples/notebook/Makefile.in \
 	../../samples/oleauto/Makefile.in \
 	../../samples/opengl/Makefile.in \
+	../../samples/opengl/cube/Makefile.in \
 	../../samples/ownerdrw/Makefile.in \
 	../../samples/png/Makefile.in \
 	../../samples/printing/Makefile.in \
@@ -91,18 +106,19 @@ AUTOCONF_ALL = \
 	../../samples/vscroll/Makefile.in \
 	../../samples/widgets/Makefile.in \
 	../../samples/wizard/Makefile.in \
-	../../samples/wxtest/Makefile.in \
-	../../contrib/src/animate/Makefile.in \
-	../../contrib/src/fl/Makefile.in \
-	../../contrib/src/gizmos/Makefile.in \
-	../../contrib/src/ogl/Makefile.in \
-	../../contrib/src/stc/Makefile.in \
-	../../contrib/src/xrc/Makefile.in \
-	../../contrib/samples/animate/Makefile.in \
-	../../contrib/samples/xrc/Makefile.in
+	../../samples/wxtest/Makefile.in
 BORLAND_ALL = \
-	../makefile.bcc \
-	../../samples/makefile.bcc \
+	../../contrib/build/animate/makefile.bcc \
+	../../contrib/build/fl/makefile.bcc \
+	../../contrib/build/gizmos/makefile.bcc \
+	../../contrib/build/ogl/makefile.bcc \
+	../../contrib/build/stc/makefile.bcc \
+	../../contrib/build/svg/makefile.bcc \
+	../../contrib/build/xrc/makefile.bcc \
+	../../contrib/samples/animate/makefile.bcc \
+	../../contrib/samples/svg/makefile.bcc \
+	../../contrib/samples/xrc/makefile.bcc \
+	../../contrib/utils/wxrc/makefile.bcc \
 	../../samples/access/makefile.bcc \
 	../../samples/artprov/makefile.bcc \
 	../../samples/calendar/makefile.bcc \
@@ -128,10 +144,10 @@ BORLAND_ALL = \
 	../../samples/grid/makefile.bcc \
 	../../samples/help/makefile.bcc \
 	../../samples/htlbox/makefile.bcc \
-	../../samples/html/makefile.bcc \
 	../../samples/html/about/makefile.bcc \
 	../../samples/html/help/makefile.bcc \
 	../../samples/html/helpview/makefile.bcc \
+	../../samples/html/makefile.bcc \
 	../../samples/html/printing/makefile.bcc \
 	../../samples/html/test/makefile.bcc \
 	../../samples/html/virtual/makefile.bcc \
@@ -145,6 +161,7 @@ BORLAND_ALL = \
 	../../samples/layout/makefile.bcc \
 	../../samples/listbox/makefile.bcc \
 	../../samples/listctrl/makefile.bcc \
+	../../samples/makefile.bcc \
 	../../samples/mdi/makefile.bcc \
 	../../samples/memcheck/makefile.bcc \
 	../../samples/menu/makefile.bcc \
@@ -157,6 +174,7 @@ BORLAND_ALL = \
 	../../samples/newgrid/makefile.bcc \
 	../../samples/notebook/makefile.bcc \
 	../../samples/oleauto/makefile.bcc \
+	../../samples/opengl/cube/makefile.bcc \
 	../../samples/opengl/makefile.bcc \
 	../../samples/ownerdrw/makefile.bcc \
 	../../samples/png/makefile.bcc \
@@ -184,17 +202,19 @@ BORLAND_ALL = \
 	../../samples/widgets/makefile.bcc \
 	../../samples/wizard/makefile.bcc \
 	../../samples/wxtest/makefile.bcc \
-	../../contrib/build/animate/makefile.bcc \
-	../../contrib/build/fl/makefile.bcc \
-	../../contrib/build/gizmos/makefile.bcc \
-	../../contrib/build/ogl/makefile.bcc \
-	../../contrib/build/stc/makefile.bcc \
-	../../contrib/build/xrc/makefile.bcc \
-	../../contrib/samples/animate/makefile.bcc \
-	../../contrib/samples/xrc/makefile.bcc
+	../makefile.bcc
 MINGW_ALL = \
-	../makefile.gcc \
-	../../samples/makefile.gcc \
+	../../contrib/build/animate/makefile.gcc \
+	../../contrib/build/fl/makefile.gcc \
+	../../contrib/build/gizmos/makefile.gcc \
+	../../contrib/build/ogl/makefile.gcc \
+	../../contrib/build/stc/makefile.gcc \
+	../../contrib/build/svg/makefile.gcc \
+	../../contrib/build/xrc/makefile.gcc \
+	../../contrib/samples/animate/makefile.gcc \
+	../../contrib/samples/svg/makefile.gcc \
+	../../contrib/samples/xrc/makefile.gcc \
+	../../contrib/utils/wxrc/makefile.gcc \
 	../../samples/access/makefile.gcc \
 	../../samples/artprov/makefile.gcc \
 	../../samples/calendar/makefile.gcc \
@@ -220,10 +240,10 @@ MINGW_ALL = \
 	../../samples/grid/makefile.gcc \
 	../../samples/help/makefile.gcc \
 	../../samples/htlbox/makefile.gcc \
-	../../samples/html/makefile.gcc \
 	../../samples/html/about/makefile.gcc \
 	../../samples/html/help/makefile.gcc \
 	../../samples/html/helpview/makefile.gcc \
+	../../samples/html/makefile.gcc \
 	../../samples/html/printing/makefile.gcc \
 	../../samples/html/test/makefile.gcc \
 	../../samples/html/virtual/makefile.gcc \
@@ -237,6 +257,7 @@ MINGW_ALL = \
 	../../samples/layout/makefile.gcc \
 	../../samples/listbox/makefile.gcc \
 	../../samples/listctrl/makefile.gcc \
+	../../samples/makefile.gcc \
 	../../samples/mdi/makefile.gcc \
 	../../samples/memcheck/makefile.gcc \
 	../../samples/menu/makefile.gcc \
@@ -249,6 +270,7 @@ MINGW_ALL = \
 	../../samples/newgrid/makefile.gcc \
 	../../samples/notebook/makefile.gcc \
 	../../samples/oleauto/makefile.gcc \
+	../../samples/opengl/cube/makefile.gcc \
 	../../samples/opengl/makefile.gcc \
 	../../samples/ownerdrw/makefile.gcc \
 	../../samples/png/makefile.gcc \
@@ -276,17 +298,19 @@ MINGW_ALL = \
 	../../samples/widgets/makefile.gcc \
 	../../samples/wizard/makefile.gcc \
 	../../samples/wxtest/makefile.gcc \
-	../../contrib/build/animate/makefile.gcc \
-	../../contrib/build/fl/makefile.gcc \
-	../../contrib/build/gizmos/makefile.gcc \
-	../../contrib/build/ogl/makefile.gcc \
-	../../contrib/build/stc/makefile.gcc \
-	../../contrib/build/xrc/makefile.gcc \
-	../../contrib/samples/animate/makefile.gcc \
-	../../contrib/samples/xrc/makefile.gcc
+	../makefile.gcc
 MSVC_ALL = \
-	../makefile.vc \
-	../../samples/makefile.vc \
+	../../contrib/build/animate/makefile.vc \
+	../../contrib/build/fl/makefile.vc \
+	../../contrib/build/gizmos/makefile.vc \
+	../../contrib/build/ogl/makefile.vc \
+	../../contrib/build/stc/makefile.vc \
+	../../contrib/build/svg/makefile.vc \
+	../../contrib/build/xrc/makefile.vc \
+	../../contrib/samples/animate/makefile.vc \
+	../../contrib/samples/svg/makefile.vc \
+	../../contrib/samples/xrc/makefile.vc \
+	../../contrib/utils/wxrc/makefile.vc \
 	../../samples/access/makefile.vc \
 	../../samples/artprov/makefile.vc \
 	../../samples/calendar/makefile.vc \
@@ -312,10 +336,10 @@ MSVC_ALL = \
 	../../samples/grid/makefile.vc \
 	../../samples/help/makefile.vc \
 	../../samples/htlbox/makefile.vc \
-	../../samples/html/makefile.vc \
 	../../samples/html/about/makefile.vc \
 	../../samples/html/help/makefile.vc \
 	../../samples/html/helpview/makefile.vc \
+	../../samples/html/makefile.vc \
 	../../samples/html/printing/makefile.vc \
 	../../samples/html/test/makefile.vc \
 	../../samples/html/virtual/makefile.vc \
@@ -329,6 +353,7 @@ MSVC_ALL = \
 	../../samples/layout/makefile.vc \
 	../../samples/listbox/makefile.vc \
 	../../samples/listctrl/makefile.vc \
+	../../samples/makefile.vc \
 	../../samples/mdi/makefile.vc \
 	../../samples/memcheck/makefile.vc \
 	../../samples/menu/makefile.vc \
@@ -341,6 +366,7 @@ MSVC_ALL = \
 	../../samples/newgrid/makefile.vc \
 	../../samples/notebook/makefile.vc \
 	../../samples/oleauto/makefile.vc \
+	../../samples/opengl/cube/makefile.vc \
 	../../samples/opengl/makefile.vc \
 	../../samples/ownerdrw/makefile.vc \
 	../../samples/png/makefile.vc \
@@ -368,17 +394,112 @@ MSVC_ALL = \
 	../../samples/widgets/makefile.vc \
 	../../samples/wizard/makefile.vc \
 	../../samples/wxtest/makefile.vc \
-	../../contrib/build/animate/makefile.vc \
-	../../contrib/build/fl/makefile.vc \
-	../../contrib/build/gizmos/makefile.vc \
-	../../contrib/build/ogl/makefile.vc \
-	../../contrib/build/stc/makefile.vc \
-	../../contrib/build/xrc/makefile.vc \
-	../../contrib/samples/animate/makefile.vc \
-	../../contrib/samples/xrc/makefile.vc
+	../makefile.vc
+MSVC6PRJ_ALL = \
+	../../contrib/build/animate/animate.dsw \
+	../../contrib/build/fl/fl.dsw \
+	../../contrib/build/gizmos/gizmos.dsw \
+	../../contrib/build/ogl/ogl.dsw \
+	../../contrib/build/stc/stc.dsw \
+	../../contrib/build/svg/svg.dsw \
+	../../contrib/build/xrc/xrc.dsw \
+	../../contrib/samples/animate/anitest.dsw \
+	../../contrib/samples/svg/svgtest.dsw \
+	../../contrib/samples/xrc/xrcdemo.dsw \
+	../../contrib/utils/wxrc/wxrc.dsw \
+	../../samples/access/access.dsw \
+	../../samples/artprov/artprov.dsw \
+	../../samples/calendar/calendar.dsw \
+	../../samples/caret/caret.dsw \
+	../../samples/checklst/checklst.dsw \
+	../../samples/config/config.dsw \
+	../../samples/console/console.dsw \
+	../../samples/controls/controls.dsw \
+	../../samples/db/db.dsw \
+	../../samples/dialogs/dialogs.dsw \
+	../../samples/dialup/dialup.dsw \
+	../../samples/display/display.dsw \
+	../../samples/dnd/dnd.dsw \
+	../../samples/docview/docview.dsw \
+	../../samples/docvwmdi/docvwmdi.dsw \
+	../../samples/dragimag/dragimag.dsw \
+	../../samples/drawing/drawing.dsw \
+	../../samples/dynamic/dynamic.dsw \
+	../../samples/erase/erase.dsw \
+	../../samples/event/event.dsw \
+	../../samples/exec/exec.dsw \
+	../../samples/font/font.dsw \
+	../../samples/grid/grid.dsw \
+	../../samples/help/help.dsw \
+	../../samples/htlbox/htlbox.dsw \
+	../../samples/html/about/about.dsw \
+	../../samples/html/help/help.dsw \
+	../../samples/html/helpview/helpview.dsw \
+	../../samples/html/printing/printing.dsw \
+	../../samples/html/test/test.dsw \
+	../../samples/html/virtual/virtual.dsw \
+	../../samples/html/widget/widget.dsw \
+	../../samples/html/zip/zip.dsw \
+	../../samples/image/image.dsw \
+	../../samples/internat/internat.dsw \
+	../../samples/ipc/ipc.dsw \
+	../../samples/joytest/joytest.dsw \
+	../../samples/keyboard/keyboard.dsw \
+	../../samples/layout/layout.dsw \
+	../../samples/listbox/listbox.dsw \
+	../../samples/listctrl/listctrl.dsw \
+	../../samples/mdi/mdi.dsw \
+	../../samples/memcheck/memcheck.dsw \
+	../../samples/menu/menu.dsw \
+	../../samples/mfc/mfc.dsw \
+	../../samples/minifram/minifram.dsw \
+	../../samples/minimal/minimal.dsw \
+	../../samples/mobile/mobile.dsw \
+	../../samples/multimon/multimon.dsw \
+	../../samples/nativdlg/nativdlg.dsw \
+	../../samples/newgrid/newgrid.dsw \
+	../../samples/notebook/notebook.dsw \
+	../../samples/oleauto/oleauto.dsw \
+	../../samples/opengl/cube/cube.dsw \
+	../../samples/ownerdrw/ownerdrw.dsw \
+	../../samples/png/png.dsw \
+	../../samples/printing/printing.dsw \
+	../../samples/propsize/propsize.dsw \
+	../../samples/regtest/regtest.dsw \
+	../../samples/richedit/richedit.dsw \
+	../../samples/rotate/rotate.dsw \
+	../../samples/sashtest/sashtest.dsw \
+	../../samples/scroll/scroll.dsw \
+	../../samples/scrollsub/scrollsub.dsw \
+	../../samples/shaped/shaped.dsw \
+	../../samples/sockets/sockets.dsw \
+	../../samples/splitter/splitter.dsw \
+	../../samples/statbar/statbar.dsw \
+	../../samples/tab/tab.dsw \
+	../../samples/taskbar/taskbar.dsw \
+	../../samples/text/text.dsw \
+	../../samples/thread/thread.dsw \
+	../../samples/toolbar/toolbar.dsw \
+	../../samples/treectrl/treectrl.dsw \
+	../../samples/typetest/typetest.dsw \
+	../../samples/validate/validate.dsw \
+	../../samples/vscroll/vscroll.dsw \
+	../../samples/widgets/widgets.dsw \
+	../../samples/wizard/wizard.dsw \
+	../../samples/wxtest/wxtest.dsw \
+	../wx.dsw
 WATCOM_ALL = \
-	../makefile.wat \
-	../../samples/makefile.wat \
+	../../contrib/build/animate/makefile.wat \
+	../../contrib/build/fl/makefile.wat \
+	../../contrib/build/gizmos/makefile.wat \
+	../../contrib/build/ogl/makefile.wat \
+	../../contrib/build/stc/makefile.wat \
+	../../contrib/build/svg/makefile.wat \
+	../../contrib/build/xrc/makefile.wat \
+	../../contrib/samples/animate/makefile.wat \
+	../../contrib/samples/svg/makefile.wat \
+	../../contrib/samples/xrc/makefile.wat \
+	../../contrib/utils/wxrc/makefile.wat \
 	../../samples/access/makefile.wat \
 	../../samples/artprov/makefile.wat \
 	../../samples/calendar/makefile.wat \
@@ -404,10 +525,10 @@ WATCOM_ALL = \
 	../../samples/grid/makefile.wat \
 	../../samples/help/makefile.wat \
 	../../samples/htlbox/makefile.wat \
-	../../samples/html/makefile.wat \
 	../../samples/html/about/makefile.wat \
 	../../samples/html/help/makefile.wat \
 	../../samples/html/helpview/makefile.wat \
+	../../samples/html/makefile.wat \
 	../../samples/html/printing/makefile.wat \
 	../../samples/html/test/makefile.wat \
 	../../samples/html/virtual/makefile.wat \
@@ -421,6 +542,7 @@ WATCOM_ALL = \
 	../../samples/layout/makefile.wat \
 	../../samples/listbox/makefile.wat \
 	../../samples/listctrl/makefile.wat \
+	../../samples/makefile.wat \
 	../../samples/mdi/makefile.wat \
 	../../samples/memcheck/makefile.wat \
 	../../samples/menu/makefile.wat \
@@ -433,6 +555,7 @@ WATCOM_ALL = \
 	../../samples/newgrid/makefile.wat \
 	../../samples/notebook/makefile.wat \
 	../../samples/oleauto/makefile.wat \
+	../../samples/opengl/cube/makefile.wat \
 	../../samples/opengl/makefile.wat \
 	../../samples/ownerdrw/makefile.wat \
 	../../samples/png/makefile.wat \
@@ -460,485 +583,590 @@ WATCOM_ALL = \
 	../../samples/widgets/makefile.wat \
 	../../samples/wizard/makefile.wat \
 	../../samples/wxtest/makefile.wat \
-	../../contrib/build/animate/makefile.wat \
-	../../contrib/build/fl/makefile.wat \
-	../../contrib/build/gizmos/makefile.wat \
-	../../contrib/build/ogl/makefile.wat \
-	../../contrib/build/stc/makefile.wat \
-	../../contrib/build/xrc/makefile.wat \
-	../../contrib/samples/animate/makefile.wat \
-	../../contrib/samples/xrc/makefile.wat
-all: autoconf borland mingw msvc watcom
+	../makefile.wat
+all: autoconf borland mingw msvc msvc6prj watcom
 
 autoconf: $(AUTOCONF_ALL)
 borland: $(BORLAND_ALL)
 mingw: $(MINGW_ALL)
 msvc: $(MSVC_ALL)
+msvc6prj: $(MSVC6PRJ_ALL)
 watcom: $(WATCOM_ALL)
 
 clean:
 	rm -f ../../autoconf_inc.m4
 	rm -f ../../Makefile.in
-	rm -f ../../configure
-	rm -f ../../contrib/build/animate/makefile.bcc
-	rm -f ../../contrib/build/animate/makefile.gcc
-	rm -f ../../contrib/build/animate/makefile.vc
-	rm -f ../../contrib/build/animate/makefile.wat
-	rm -f ../../contrib/build/fl/makefile.bcc
-	rm -f ../../contrib/build/fl/makefile.gcc
-	rm -f ../../contrib/build/fl/makefile.vc
-	rm -f ../../contrib/build/fl/makefile.wat
-	rm -f ../../contrib/build/gizmos/makefile.bcc
-	rm -f ../../contrib/build/gizmos/makefile.gcc
-	rm -f ../../contrib/build/gizmos/makefile.vc
-	rm -f ../../contrib/build/gizmos/makefile.wat
-	rm -f ../../contrib/build/ogl/makefile.bcc
-	rm -f ../../contrib/build/ogl/makefile.gcc
-	rm -f ../../contrib/build/ogl/makefile.vc
-	rm -f ../../contrib/build/ogl/makefile.wat
-	rm -f ../../contrib/build/stc/makefile.bcc
-	rm -f ../../contrib/build/stc/makefile.gcc
-	rm -f ../../contrib/build/stc/makefile.vc
-	rm -f ../../contrib/build/stc/makefile.wat
-	rm -f ../../contrib/build/xrc/makefile.bcc
-	rm -f ../../contrib/build/xrc/makefile.gcc
-	rm -f ../../contrib/build/xrc/makefile.vc
-	rm -f ../../contrib/build/xrc/makefile.wat
 	rm -f ../../contrib/samples/animate/Makefile.in
-	rm -f ../../contrib/samples/animate/makefile.bcc
-	rm -f ../../contrib/samples/animate/makefile.gcc
-	rm -f ../../contrib/samples/animate/makefile.vc
-	rm -f ../../contrib/samples/animate/makefile.wat
+	rm -f ../../contrib/samples/svg/Makefile.in
 	rm -f ../../contrib/samples/xrc/Makefile.in
-	rm -f ../../contrib/samples/xrc/makefile.bcc
-	rm -f ../../contrib/samples/xrc/makefile.gcc
-	rm -f ../../contrib/samples/xrc/makefile.vc
-	rm -f ../../contrib/samples/xrc/makefile.wat
 	rm -f ../../contrib/src/animate/Makefile.in
 	rm -f ../../contrib/src/fl/Makefile.in
 	rm -f ../../contrib/src/gizmos/Makefile.in
 	rm -f ../../contrib/src/ogl/Makefile.in
 	rm -f ../../contrib/src/stc/Makefile.in
+	rm -f ../../contrib/src/svg/Makefile.in
 	rm -f ../../contrib/src/xrc/Makefile.in
+	rm -f ../../contrib/utils/wxrc/Makefile.in
 	rm -f ../../samples/Makefile.in
 	rm -f ../../samples/access/Makefile.in
-	rm -f ../../samples/access/makefile.bcc
-	rm -f ../../samples/access/makefile.gcc
-	rm -f ../../samples/access/makefile.vc
-	rm -f ../../samples/access/makefile.wat
 	rm -f ../../samples/artprov/Makefile.in
-	rm -f ../../samples/artprov/makefile.bcc
-	rm -f ../../samples/artprov/makefile.gcc
-	rm -f ../../samples/artprov/makefile.vc
-	rm -f ../../samples/artprov/makefile.wat
 	rm -f ../../samples/calendar/Makefile.in
-	rm -f ../../samples/calendar/makefile.bcc
-	rm -f ../../samples/calendar/makefile.gcc
-	rm -f ../../samples/calendar/makefile.vc
-	rm -f ../../samples/calendar/makefile.wat
 	rm -f ../../samples/caret/Makefile.in
-	rm -f ../../samples/caret/makefile.bcc
-	rm -f ../../samples/caret/makefile.gcc
-	rm -f ../../samples/caret/makefile.vc
-	rm -f ../../samples/caret/makefile.wat
 	rm -f ../../samples/checklst/Makefile.in
-	rm -f ../../samples/checklst/makefile.bcc
-	rm -f ../../samples/checklst/makefile.gcc
-	rm -f ../../samples/checklst/makefile.vc
-	rm -f ../../samples/checklst/makefile.wat
 	rm -f ../../samples/config/Makefile.in
-	rm -f ../../samples/config/makefile.bcc
-	rm -f ../../samples/config/makefile.gcc
-	rm -f ../../samples/config/makefile.vc
-	rm -f ../../samples/config/makefile.wat
 	rm -f ../../samples/console/Makefile.in
-	rm -f ../../samples/console/makefile.bcc
-	rm -f ../../samples/console/makefile.gcc
-	rm -f ../../samples/console/makefile.vc
-	rm -f ../../samples/console/makefile.wat
 	rm -f ../../samples/controls/Makefile.in
-	rm -f ../../samples/controls/makefile.bcc
-	rm -f ../../samples/controls/makefile.gcc
-	rm -f ../../samples/controls/makefile.vc
-	rm -f ../../samples/controls/makefile.wat
 	rm -f ../../samples/db/Makefile.in
-	rm -f ../../samples/db/makefile.bcc
-	rm -f ../../samples/db/makefile.gcc
-	rm -f ../../samples/db/makefile.vc
-	rm -f ../../samples/db/makefile.wat
 	rm -f ../../samples/dialogs/Makefile.in
-	rm -f ../../samples/dialogs/makefile.bcc
-	rm -f ../../samples/dialogs/makefile.gcc
-	rm -f ../../samples/dialogs/makefile.vc
-	rm -f ../../samples/dialogs/makefile.wat
 	rm -f ../../samples/dialup/Makefile.in
-	rm -f ../../samples/dialup/makefile.bcc
-	rm -f ../../samples/dialup/makefile.gcc
-	rm -f ../../samples/dialup/makefile.vc
-	rm -f ../../samples/dialup/makefile.wat
 	rm -f ../../samples/display/Makefile.in
-	rm -f ../../samples/display/makefile.bcc
-	rm -f ../../samples/display/makefile.gcc
-	rm -f ../../samples/display/makefile.vc
-	rm -f ../../samples/display/makefile.wat
 	rm -f ../../samples/dnd/Makefile.in
-	rm -f ../../samples/dnd/makefile.bcc
-	rm -f ../../samples/dnd/makefile.gcc
-	rm -f ../../samples/dnd/makefile.vc
-	rm -f ../../samples/dnd/makefile.wat
 	rm -f ../../samples/docview/Makefile.in
-	rm -f ../../samples/docview/makefile.bcc
-	rm -f ../../samples/docview/makefile.gcc
-	rm -f ../../samples/docview/makefile.vc
-	rm -f ../../samples/docview/makefile.wat
 	rm -f ../../samples/docvwmdi/Makefile.in
-	rm -f ../../samples/docvwmdi/makefile.bcc
-	rm -f ../../samples/docvwmdi/makefile.gcc
-	rm -f ../../samples/docvwmdi/makefile.vc
-	rm -f ../../samples/docvwmdi/makefile.wat
 	rm -f ../../samples/dragimag/Makefile.in
-	rm -f ../../samples/dragimag/makefile.bcc
-	rm -f ../../samples/dragimag/makefile.gcc
-	rm -f ../../samples/dragimag/makefile.vc
-	rm -f ../../samples/dragimag/makefile.wat
 	rm -f ../../samples/drawing/Makefile.in
-	rm -f ../../samples/drawing/makefile.bcc
-	rm -f ../../samples/drawing/makefile.gcc
-	rm -f ../../samples/drawing/makefile.vc
-	rm -f ../../samples/drawing/makefile.wat
 	rm -f ../../samples/dynamic/Makefile.in
-	rm -f ../../samples/dynamic/makefile.bcc
-	rm -f ../../samples/dynamic/makefile.gcc
-	rm -f ../../samples/dynamic/makefile.vc
-	rm -f ../../samples/dynamic/makefile.wat
 	rm -f ../../samples/erase/Makefile.in
-	rm -f ../../samples/erase/makefile.bcc
-	rm -f ../../samples/erase/makefile.gcc
-	rm -f ../../samples/erase/makefile.vc
-	rm -f ../../samples/erase/makefile.wat
 	rm -f ../../samples/event/Makefile.in
-	rm -f ../../samples/event/makefile.bcc
-	rm -f ../../samples/event/makefile.gcc
-	rm -f ../../samples/event/makefile.vc
-	rm -f ../../samples/event/makefile.wat
 	rm -f ../../samples/exec/Makefile.in
-	rm -f ../../samples/exec/makefile.bcc
-	rm -f ../../samples/exec/makefile.gcc
-	rm -f ../../samples/exec/makefile.vc
-	rm -f ../../samples/exec/makefile.wat
 	rm -f ../../samples/font/Makefile.in
-	rm -f ../../samples/font/makefile.bcc
-	rm -f ../../samples/font/makefile.gcc
-	rm -f ../../samples/font/makefile.vc
-	rm -f ../../samples/font/makefile.wat
 	rm -f ../../samples/grid/Makefile.in
-	rm -f ../../samples/grid/makefile.bcc
-	rm -f ../../samples/grid/makefile.gcc
-	rm -f ../../samples/grid/makefile.vc
-	rm -f ../../samples/grid/makefile.wat
 	rm -f ../../samples/help/Makefile.in
-	rm -f ../../samples/help/makefile.bcc
-	rm -f ../../samples/help/makefile.gcc
-	rm -f ../../samples/help/makefile.vc
-	rm -f ../../samples/help/makefile.wat
 	rm -f ../../samples/htlbox/Makefile.in
-	rm -f ../../samples/htlbox/makefile.bcc
-	rm -f ../../samples/htlbox/makefile.gcc
-	rm -f ../../samples/htlbox/makefile.vc
-	rm -f ../../samples/htlbox/makefile.wat
 	rm -f ../../samples/html/Makefile.in
 	rm -f ../../samples/html/about/Makefile.in
-	rm -f ../../samples/html/about/makefile.bcc
-	rm -f ../../samples/html/about/makefile.gcc
-	rm -f ../../samples/html/about/makefile.vc
-	rm -f ../../samples/html/about/makefile.wat
 	rm -f ../../samples/html/help/Makefile.in
-	rm -f ../../samples/html/help/makefile.bcc
-	rm -f ../../samples/html/help/makefile.gcc
-	rm -f ../../samples/html/help/makefile.vc
-	rm -f ../../samples/html/help/makefile.wat
 	rm -f ../../samples/html/helpview/Makefile.in
-	rm -f ../../samples/html/helpview/makefile.bcc
-	rm -f ../../samples/html/helpview/makefile.gcc
-	rm -f ../../samples/html/helpview/makefile.vc
-	rm -f ../../samples/html/helpview/makefile.wat
-	rm -f ../../samples/html/makefile.bcc
-	rm -f ../../samples/html/makefile.gcc
-	rm -f ../../samples/html/makefile.vc
-	rm -f ../../samples/html/makefile.wat
 	rm -f ../../samples/html/printing/Makefile.in
-	rm -f ../../samples/html/printing/makefile.bcc
-	rm -f ../../samples/html/printing/makefile.gcc
-	rm -f ../../samples/html/printing/makefile.vc
-	rm -f ../../samples/html/printing/makefile.wat
 	rm -f ../../samples/html/test/Makefile.in
-	rm -f ../../samples/html/test/makefile.bcc
-	rm -f ../../samples/html/test/makefile.gcc
-	rm -f ../../samples/html/test/makefile.vc
-	rm -f ../../samples/html/test/makefile.wat
 	rm -f ../../samples/html/virtual/Makefile.in
-	rm -f ../../samples/html/virtual/makefile.bcc
-	rm -f ../../samples/html/virtual/makefile.gcc
-	rm -f ../../samples/html/virtual/makefile.vc
-	rm -f ../../samples/html/virtual/makefile.wat
 	rm -f ../../samples/html/widget/Makefile.in
-	rm -f ../../samples/html/widget/makefile.bcc
-	rm -f ../../samples/html/widget/makefile.gcc
-	rm -f ../../samples/html/widget/makefile.vc
-	rm -f ../../samples/html/widget/makefile.wat
 	rm -f ../../samples/html/zip/Makefile.in
-	rm -f ../../samples/html/zip/makefile.bcc
-	rm -f ../../samples/html/zip/makefile.gcc
-	rm -f ../../samples/html/zip/makefile.vc
-	rm -f ../../samples/html/zip/makefile.wat
 	rm -f ../../samples/image/Makefile.in
-	rm -f ../../samples/image/makefile.bcc
-	rm -f ../../samples/image/makefile.gcc
-	rm -f ../../samples/image/makefile.vc
-	rm -f ../../samples/image/makefile.wat
 	rm -f ../../samples/internat/Makefile.in
-	rm -f ../../samples/internat/makefile.bcc
-	rm -f ../../samples/internat/makefile.gcc
-	rm -f ../../samples/internat/makefile.vc
-	rm -f ../../samples/internat/makefile.wat
 	rm -f ../../samples/ipc/Makefile.in
-	rm -f ../../samples/ipc/makefile.bcc
-	rm -f ../../samples/ipc/makefile.gcc
-	rm -f ../../samples/ipc/makefile.vc
-	rm -f ../../samples/ipc/makefile.wat
 	rm -f ../../samples/joytest/Makefile.in
-	rm -f ../../samples/joytest/makefile.bcc
-	rm -f ../../samples/joytest/makefile.gcc
-	rm -f ../../samples/joytest/makefile.vc
-	rm -f ../../samples/joytest/makefile.wat
 	rm -f ../../samples/keyboard/Makefile.in
-	rm -f ../../samples/keyboard/makefile.bcc
-	rm -f ../../samples/keyboard/makefile.gcc
-	rm -f ../../samples/keyboard/makefile.vc
-	rm -f ../../samples/keyboard/makefile.wat
 	rm -f ../../samples/layout/Makefile.in
-	rm -f ../../samples/layout/makefile.bcc
-	rm -f ../../samples/layout/makefile.gcc
-	rm -f ../../samples/layout/makefile.vc
-	rm -f ../../samples/layout/makefile.wat
 	rm -f ../../samples/listbox/Makefile.in
-	rm -f ../../samples/listbox/makefile.bcc
-	rm -f ../../samples/listbox/makefile.gcc
-	rm -f ../../samples/listbox/makefile.vc
-	rm -f ../../samples/listbox/makefile.wat
 	rm -f ../../samples/listctrl/Makefile.in
+	rm -f ../../samples/mdi/Makefile.in
+	rm -f ../../samples/memcheck/Makefile.in
+	rm -f ../../samples/menu/Makefile.in
+	rm -f ../../samples/mfc/Makefile.in
+	rm -f ../../samples/minifram/Makefile.in
+	rm -f ../../samples/minimal/Makefile.in
+	rm -f ../../samples/mobile/Makefile.in
+	rm -f ../../samples/multimon/Makefile.in
+	rm -f ../../samples/nativdlg/Makefile.in
+	rm -f ../../samples/newgrid/Makefile.in
+	rm -f ../../samples/notebook/Makefile.in
+	rm -f ../../samples/oleauto/Makefile.in
+	rm -f ../../samples/opengl/Makefile.in
+	rm -f ../../samples/opengl/cube/Makefile.in
+	rm -f ../../samples/ownerdrw/Makefile.in
+	rm -f ../../samples/png/Makefile.in
+	rm -f ../../samples/printing/Makefile.in
+	rm -f ../../samples/propsize/Makefile.in
+	rm -f ../../samples/regtest/Makefile.in
+	rm -f ../../samples/richedit/Makefile.in
+	rm -f ../../samples/rotate/Makefile.in
+	rm -f ../../samples/sashtest/Makefile.in
+	rm -f ../../samples/scroll/Makefile.in
+	rm -f ../../samples/scrollsub/Makefile.in
+	rm -f ../../samples/shaped/Makefile.in
+	rm -f ../../samples/sockets/Makefile.in
+	rm -f ../../samples/splitter/Makefile.in
+	rm -f ../../samples/statbar/Makefile.in
+	rm -f ../../samples/tab/Makefile.in
+	rm -f ../../samples/taskbar/Makefile.in
+	rm -f ../../samples/text/Makefile.in
+	rm -f ../../samples/thread/Makefile.in
+	rm -f ../../samples/toolbar/Makefile.in
+	rm -f ../../samples/treectrl/Makefile.in
+	rm -f ../../samples/typetest/Makefile.in
+	rm -f ../../samples/validate/Makefile.in
+	rm -f ../../samples/vscroll/Makefile.in
+	rm -f ../../samples/widgets/Makefile.in
+	rm -f ../../samples/wizard/Makefile.in
+	rm -f ../../samples/wxtest/Makefile.in
+	rm -f ../../contrib/build/animate/makefile.bcc
+	rm -f ../../contrib/build/fl/makefile.bcc
+	rm -f ../../contrib/build/gizmos/makefile.bcc
+	rm -f ../../contrib/build/ogl/makefile.bcc
+	rm -f ../../contrib/build/stc/makefile.bcc
+	rm -f ../../contrib/build/svg/makefile.bcc
+	rm -f ../../contrib/build/xrc/makefile.bcc
+	rm -f ../../contrib/samples/animate/makefile.bcc
+	rm -f ../../contrib/samples/svg/makefile.bcc
+	rm -f ../../contrib/samples/xrc/makefile.bcc
+	rm -f ../../contrib/utils/wxrc/makefile.bcc
+	rm -f ../../samples/access/makefile.bcc
+	rm -f ../../samples/artprov/makefile.bcc
+	rm -f ../../samples/calendar/makefile.bcc
+	rm -f ../../samples/caret/makefile.bcc
+	rm -f ../../samples/checklst/makefile.bcc
+	rm -f ../../samples/config/makefile.bcc
+	rm -f ../../samples/console/makefile.bcc
+	rm -f ../../samples/controls/makefile.bcc
+	rm -f ../../samples/db/makefile.bcc
+	rm -f ../../samples/dialogs/makefile.bcc
+	rm -f ../../samples/dialup/makefile.bcc
+	rm -f ../../samples/display/makefile.bcc
+	rm -f ../../samples/dnd/makefile.bcc
+	rm -f ../../samples/docview/makefile.bcc
+	rm -f ../../samples/docvwmdi/makefile.bcc
+	rm -f ../../samples/dragimag/makefile.bcc
+	rm -f ../../samples/drawing/makefile.bcc
+	rm -f ../../samples/dynamic/makefile.bcc
+	rm -f ../../samples/erase/makefile.bcc
+	rm -f ../../samples/event/makefile.bcc
+	rm -f ../../samples/exec/makefile.bcc
+	rm -f ../../samples/font/makefile.bcc
+	rm -f ../../samples/grid/makefile.bcc
+	rm -f ../../samples/help/makefile.bcc
+	rm -f ../../samples/htlbox/makefile.bcc
+	rm -f ../../samples/html/about/makefile.bcc
+	rm -f ../../samples/html/help/makefile.bcc
+	rm -f ../../samples/html/helpview/makefile.bcc
+	rm -f ../../samples/html/makefile.bcc
+	rm -f ../../samples/html/printing/makefile.bcc
+	rm -f ../../samples/html/test/makefile.bcc
+	rm -f ../../samples/html/virtual/makefile.bcc
+	rm -f ../../samples/html/widget/makefile.bcc
+	rm -f ../../samples/html/zip/makefile.bcc
+	rm -f ../../samples/image/makefile.bcc
+	rm -f ../../samples/internat/makefile.bcc
+	rm -f ../../samples/ipc/makefile.bcc
+	rm -f ../../samples/joytest/makefile.bcc
+	rm -f ../../samples/keyboard/makefile.bcc
+	rm -f ../../samples/layout/makefile.bcc
+	rm -f ../../samples/listbox/makefile.bcc
 	rm -f ../../samples/listctrl/makefile.bcc
-	rm -f ../../samples/listctrl/makefile.gcc
-	rm -f ../../samples/listctrl/makefile.vc
-	rm -f ../../samples/listctrl/makefile.wat
 	rm -f ../../samples/makefile.bcc
-	rm -f ../../samples/makefile.gcc
-	rm -f ../../samples/makefile.vc
-	rm -f ../../samples/makefile.wat
-	rm -f ../../samples/mdi/Makefile.in
 	rm -f ../../samples/mdi/makefile.bcc
-	rm -f ../../samples/mdi/makefile.gcc
-	rm -f ../../samples/mdi/makefile.vc
-	rm -f ../../samples/mdi/makefile.wat
-	rm -f ../../samples/memcheck/Makefile.in
 	rm -f ../../samples/memcheck/makefile.bcc
-	rm -f ../../samples/memcheck/makefile.gcc
-	rm -f ../../samples/memcheck/makefile.vc
-	rm -f ../../samples/memcheck/makefile.wat
-	rm -f ../../samples/menu/Makefile.in
 	rm -f ../../samples/menu/makefile.bcc
-	rm -f ../../samples/menu/makefile.gcc
-	rm -f ../../samples/menu/makefile.vc
-	rm -f ../../samples/menu/makefile.wat
-	rm -f ../../samples/mfc/Makefile.in
 	rm -f ../../samples/mfc/makefile.bcc
-	rm -f ../../samples/mfc/makefile.gcc
-	rm -f ../../samples/mfc/makefile.vc
-	rm -f ../../samples/mfc/makefile.wat
-	rm -f ../../samples/minifram/Makefile.in
 	rm -f ../../samples/minifram/makefile.bcc
-	rm -f ../../samples/minifram/makefile.gcc
-	rm -f ../../samples/minifram/makefile.vc
-	rm -f ../../samples/minifram/makefile.wat
-	rm -f ../../samples/minimal/Makefile.in
 	rm -f ../../samples/minimal/makefile.bcc
+	rm -f ../../samples/mobile/makefile.bcc
+	rm -f ../../samples/multimon/makefile.bcc
+	rm -f ../../samples/nativdlg/makefile.bcc
+	rm -f ../../samples/newgrid/makefile.bcc
+	rm -f ../../samples/notebook/makefile.bcc
+	rm -f ../../samples/oleauto/makefile.bcc
+	rm -f ../../samples/opengl/cube/makefile.bcc
+	rm -f ../../samples/opengl/makefile.bcc
+	rm -f ../../samples/ownerdrw/makefile.bcc
+	rm -f ../../samples/png/makefile.bcc
+	rm -f ../../samples/printing/makefile.bcc
+	rm -f ../../samples/propsize/makefile.bcc
+	rm -f ../../samples/regtest/makefile.bcc
+	rm -f ../../samples/richedit/makefile.bcc
+	rm -f ../../samples/rotate/makefile.bcc
+	rm -f ../../samples/sashtest/makefile.bcc
+	rm -f ../../samples/scroll/makefile.bcc
+	rm -f ../../samples/scrollsub/makefile.bcc
+	rm -f ../../samples/shaped/makefile.bcc
+	rm -f ../../samples/sockets/makefile.bcc
+	rm -f ../../samples/splitter/makefile.bcc
+	rm -f ../../samples/statbar/makefile.bcc
+	rm -f ../../samples/tab/makefile.bcc
+	rm -f ../../samples/taskbar/makefile.bcc
+	rm -f ../../samples/text/makefile.bcc
+	rm -f ../../samples/thread/makefile.bcc
+	rm -f ../../samples/toolbar/makefile.bcc
+	rm -f ../../samples/treectrl/makefile.bcc
+	rm -f ../../samples/typetest/makefile.bcc
+	rm -f ../../samples/validate/makefile.bcc
+	rm -f ../../samples/vscroll/makefile.bcc
+	rm -f ../../samples/widgets/makefile.bcc
+	rm -f ../../samples/wizard/makefile.bcc
+	rm -f ../../samples/wxtest/makefile.bcc
+	rm -f ../makefile.bcc
+	rm -f ../../contrib/build/animate/makefile.gcc
+	rm -f ../../contrib/build/fl/makefile.gcc
+	rm -f ../../contrib/build/gizmos/makefile.gcc
+	rm -f ../../contrib/build/ogl/makefile.gcc
+	rm -f ../../contrib/build/stc/makefile.gcc
+	rm -f ../../contrib/build/svg/makefile.gcc
+	rm -f ../../contrib/build/xrc/makefile.gcc
+	rm -f ../../contrib/samples/animate/makefile.gcc
+	rm -f ../../contrib/samples/svg/makefile.gcc
+	rm -f ../../contrib/samples/xrc/makefile.gcc
+	rm -f ../../contrib/utils/wxrc/makefile.gcc
+	rm -f ../../samples/access/makefile.gcc
+	rm -f ../../samples/artprov/makefile.gcc
+	rm -f ../../samples/calendar/makefile.gcc
+	rm -f ../../samples/caret/makefile.gcc
+	rm -f ../../samples/checklst/makefile.gcc
+	rm -f ../../samples/config/makefile.gcc
+	rm -f ../../samples/console/makefile.gcc
+	rm -f ../../samples/controls/makefile.gcc
+	rm -f ../../samples/db/makefile.gcc
+	rm -f ../../samples/dialogs/makefile.gcc
+	rm -f ../../samples/dialup/makefile.gcc
+	rm -f ../../samples/display/makefile.gcc
+	rm -f ../../samples/dnd/makefile.gcc
+	rm -f ../../samples/docview/makefile.gcc
+	rm -f ../../samples/docvwmdi/makefile.gcc
+	rm -f ../../samples/dragimag/makefile.gcc
+	rm -f ../../samples/drawing/makefile.gcc
+	rm -f ../../samples/dynamic/makefile.gcc
+	rm -f ../../samples/erase/makefile.gcc
+	rm -f ../../samples/event/makefile.gcc
+	rm -f ../../samples/exec/makefile.gcc
+	rm -f ../../samples/font/makefile.gcc
+	rm -f ../../samples/grid/makefile.gcc
+	rm -f ../../samples/help/makefile.gcc
+	rm -f ../../samples/htlbox/makefile.gcc
+	rm -f ../../samples/html/about/makefile.gcc
+	rm -f ../../samples/html/help/makefile.gcc
+	rm -f ../../samples/html/helpview/makefile.gcc
+	rm -f ../../samples/html/makefile.gcc
+	rm -f ../../samples/html/printing/makefile.gcc
+	rm -f ../../samples/html/test/makefile.gcc
+	rm -f ../../samples/html/virtual/makefile.gcc
+	rm -f ../../samples/html/widget/makefile.gcc
+	rm -f ../../samples/html/zip/makefile.gcc
+	rm -f ../../samples/image/makefile.gcc
+	rm -f ../../samples/internat/makefile.gcc
+	rm -f ../../samples/ipc/makefile.gcc
+	rm -f ../../samples/joytest/makefile.gcc
+	rm -f ../../samples/keyboard/makefile.gcc
+	rm -f ../../samples/layout/makefile.gcc
+	rm -f ../../samples/listbox/makefile.gcc
+	rm -f ../../samples/listctrl/makefile.gcc
+	rm -f ../../samples/makefile.gcc
+	rm -f ../../samples/mdi/makefile.gcc
+	rm -f ../../samples/memcheck/makefile.gcc
+	rm -f ../../samples/menu/makefile.gcc
+	rm -f ../../samples/mfc/makefile.gcc
+	rm -f ../../samples/minifram/makefile.gcc
 	rm -f ../../samples/minimal/makefile.gcc
+	rm -f ../../samples/mobile/makefile.gcc
+	rm -f ../../samples/multimon/makefile.gcc
+	rm -f ../../samples/nativdlg/makefile.gcc
+	rm -f ../../samples/newgrid/makefile.gcc
+	rm -f ../../samples/notebook/makefile.gcc
+	rm -f ../../samples/oleauto/makefile.gcc
+	rm -f ../../samples/opengl/cube/makefile.gcc
+	rm -f ../../samples/opengl/makefile.gcc
+	rm -f ../../samples/ownerdrw/makefile.gcc
+	rm -f ../../samples/png/makefile.gcc
+	rm -f ../../samples/printing/makefile.gcc
+	rm -f ../../samples/propsize/makefile.gcc
+	rm -f ../../samples/regtest/makefile.gcc
+	rm -f ../../samples/richedit/makefile.gcc
+	rm -f ../../samples/rotate/makefile.gcc
+	rm -f ../../samples/sashtest/makefile.gcc
+	rm -f ../../samples/scroll/makefile.gcc
+	rm -f ../../samples/scrollsub/makefile.gcc
+	rm -f ../../samples/shaped/makefile.gcc
+	rm -f ../../samples/sockets/makefile.gcc
+	rm -f ../../samples/splitter/makefile.gcc
+	rm -f ../../samples/statbar/makefile.gcc
+	rm -f ../../samples/tab/makefile.gcc
+	rm -f ../../samples/taskbar/makefile.gcc
+	rm -f ../../samples/text/makefile.gcc
+	rm -f ../../samples/thread/makefile.gcc
+	rm -f ../../samples/toolbar/makefile.gcc
+	rm -f ../../samples/treectrl/makefile.gcc
+	rm -f ../../samples/typetest/makefile.gcc
+	rm -f ../../samples/validate/makefile.gcc
+	rm -f ../../samples/vscroll/makefile.gcc
+	rm -f ../../samples/widgets/makefile.gcc
+	rm -f ../../samples/wizard/makefile.gcc
+	rm -f ../../samples/wxtest/makefile.gcc
+	rm -f ../makefile.gcc
+	rm -f ../../contrib/build/animate/makefile.vc
+	rm -f ../../contrib/build/fl/makefile.vc
+	rm -f ../../contrib/build/gizmos/makefile.vc
+	rm -f ../../contrib/build/ogl/makefile.vc
+	rm -f ../../contrib/build/stc/makefile.vc
+	rm -f ../../contrib/build/svg/makefile.vc
+	rm -f ../../contrib/build/xrc/makefile.vc
+	rm -f ../../contrib/samples/animate/makefile.vc
+	rm -f ../../contrib/samples/svg/makefile.vc
+	rm -f ../../contrib/samples/xrc/makefile.vc
+	rm -f ../../contrib/utils/wxrc/makefile.vc
+	rm -f ../../samples/access/makefile.vc
+	rm -f ../../samples/artprov/makefile.vc
+	rm -f ../../samples/calendar/makefile.vc
+	rm -f ../../samples/caret/makefile.vc
+	rm -f ../../samples/checklst/makefile.vc
+	rm -f ../../samples/config/makefile.vc
+	rm -f ../../samples/console/makefile.vc
+	rm -f ../../samples/controls/makefile.vc
+	rm -f ../../samples/db/makefile.vc
+	rm -f ../../samples/dialogs/makefile.vc
+	rm -f ../../samples/dialup/makefile.vc
+	rm -f ../../samples/display/makefile.vc
+	rm -f ../../samples/dnd/makefile.vc
+	rm -f ../../samples/docview/makefile.vc
+	rm -f ../../samples/docvwmdi/makefile.vc
+	rm -f ../../samples/dragimag/makefile.vc
+	rm -f ../../samples/drawing/makefile.vc
+	rm -f ../../samples/dynamic/makefile.vc
+	rm -f ../../samples/erase/makefile.vc
+	rm -f ../../samples/event/makefile.vc
+	rm -f ../../samples/exec/makefile.vc
+	rm -f ../../samples/font/makefile.vc
+	rm -f ../../samples/grid/makefile.vc
+	rm -f ../../samples/help/makefile.vc
+	rm -f ../../samples/htlbox/makefile.vc
+	rm -f ../../samples/html/about/makefile.vc
+	rm -f ../../samples/html/help/makefile.vc
+	rm -f ../../samples/html/helpview/makefile.vc
+	rm -f ../../samples/html/makefile.vc
+	rm -f ../../samples/html/printing/makefile.vc
+	rm -f ../../samples/html/test/makefile.vc
+	rm -f ../../samples/html/virtual/makefile.vc
+	rm -f ../../samples/html/widget/makefile.vc
+	rm -f ../../samples/html/zip/makefile.vc
+	rm -f ../../samples/image/makefile.vc
+	rm -f ../../samples/internat/makefile.vc
+	rm -f ../../samples/ipc/makefile.vc
+	rm -f ../../samples/joytest/makefile.vc
+	rm -f ../../samples/keyboard/makefile.vc
+	rm -f ../../samples/layout/makefile.vc
+	rm -f ../../samples/listbox/makefile.vc
+	rm -f ../../samples/listctrl/makefile.vc
+	rm -f ../../samples/makefile.vc
+	rm -f ../../samples/mdi/makefile.vc
+	rm -f ../../samples/memcheck/makefile.vc
+	rm -f ../../samples/menu/makefile.vc
+	rm -f ../../samples/mfc/makefile.vc
+	rm -f ../../samples/minifram/makefile.vc
 	rm -f ../../samples/minimal/makefile.vc
+	rm -f ../../samples/mobile/makefile.vc
+	rm -f ../../samples/multimon/makefile.vc
+	rm -f ../../samples/nativdlg/makefile.vc
+	rm -f ../../samples/newgrid/makefile.vc
+	rm -f ../../samples/notebook/makefile.vc
+	rm -f ../../samples/oleauto/makefile.vc
+	rm -f ../../samples/opengl/cube/makefile.vc
+	rm -f ../../samples/opengl/makefile.vc
+	rm -f ../../samples/ownerdrw/makefile.vc
+	rm -f ../../samples/png/makefile.vc
+	rm -f ../../samples/printing/makefile.vc
+	rm -f ../../samples/propsize/makefile.vc
+	rm -f ../../samples/regtest/makefile.vc
+	rm -f ../../samples/richedit/makefile.vc
+	rm -f ../../samples/rotate/makefile.vc
+	rm -f ../../samples/sashtest/makefile.vc
+	rm -f ../../samples/scroll/makefile.vc
+	rm -f ../../samples/scrollsub/makefile.vc
+	rm -f ../../samples/shaped/makefile.vc
+	rm -f ../../samples/sockets/makefile.vc
+	rm -f ../../samples/splitter/makefile.vc
+	rm -f ../../samples/statbar/makefile.vc
+	rm -f ../../samples/tab/makefile.vc
+	rm -f ../../samples/taskbar/makefile.vc
+	rm -f ../../samples/text/makefile.vc
+	rm -f ../../samples/thread/makefile.vc
+	rm -f ../../samples/toolbar/makefile.vc
+	rm -f ../../samples/treectrl/makefile.vc
+	rm -f ../../samples/typetest/makefile.vc
+	rm -f ../../samples/validate/makefile.vc
+	rm -f ../../samples/vscroll/makefile.vc
+	rm -f ../../samples/widgets/makefile.vc
+	rm -f ../../samples/wizard/makefile.vc
+	rm -f ../../samples/wxtest/makefile.vc
+	rm -f ../makefile.vc
+	rm -f ../../contrib/build/animate/animate.dsw
+	rm -f ../../contrib/build/fl/fl.dsw
+	rm -f ../../contrib/build/gizmos/gizmos.dsw
+	rm -f ../../contrib/build/ogl/ogl.dsw
+	rm -f ../../contrib/build/stc/stc.dsw
+	rm -f ../../contrib/build/svg/svg.dsw
+	rm -f ../../contrib/build/xrc/xrc.dsw
+	rm -f ../../contrib/samples/animate/anitest.dsw
+	rm -f ../../contrib/samples/svg/svgtest.dsw
+	rm -f ../../contrib/samples/xrc/xrcdemo.dsw
+	rm -f ../../contrib/utils/wxrc/wxrc.dsw
+	rm -f ../../samples/access/access.dsw
+	rm -f ../../samples/artprov/artprov.dsw
+	rm -f ../../samples/calendar/calendar.dsw
+	rm -f ../../samples/caret/caret.dsw
+	rm -f ../../samples/checklst/checklst.dsw
+	rm -f ../../samples/config/config.dsw
+	rm -f ../../samples/console/console.dsw
+	rm -f ../../samples/controls/controls.dsw
+	rm -f ../../samples/db/db.dsw
+	rm -f ../../samples/dialogs/dialogs.dsw
+	rm -f ../../samples/dialup/dialup.dsw
+	rm -f ../../samples/display/display.dsw
+	rm -f ../../samples/dnd/dnd.dsw
+	rm -f ../../samples/docview/docview.dsw
+	rm -f ../../samples/docvwmdi/docvwmdi.dsw
+	rm -f ../../samples/dragimag/dragimag.dsw
+	rm -f ../../samples/drawing/drawing.dsw
+	rm -f ../../samples/dynamic/dynamic.dsw
+	rm -f ../../samples/erase/erase.dsw
+	rm -f ../../samples/event/event.dsw
+	rm -f ../../samples/exec/exec.dsw
+	rm -f ../../samples/font/font.dsw
+	rm -f ../../samples/grid/grid.dsw
+	rm -f ../../samples/help/help.dsw
+	rm -f ../../samples/htlbox/htlbox.dsw
+	rm -f ../../samples/html/about/about.dsw
+	rm -f ../../samples/html/help/help.dsw
+	rm -f ../../samples/html/helpview/helpview.dsw
+	rm -f ../../samples/html/printing/printing.dsw
+	rm -f ../../samples/html/test/test.dsw
+	rm -f ../../samples/html/virtual/virtual.dsw
+	rm -f ../../samples/html/widget/widget.dsw
+	rm -f ../../samples/html/zip/zip.dsw
+	rm -f ../../samples/image/image.dsw
+	rm -f ../../samples/internat/internat.dsw
+	rm -f ../../samples/ipc/ipc.dsw
+	rm -f ../../samples/joytest/joytest.dsw
+	rm -f ../../samples/keyboard/keyboard.dsw
+	rm -f ../../samples/layout/layout.dsw
+	rm -f ../../samples/listbox/listbox.dsw
+	rm -f ../../samples/listctrl/listctrl.dsw
+	rm -f ../../samples/mdi/mdi.dsw
+	rm -f ../../samples/memcheck/memcheck.dsw
+	rm -f ../../samples/menu/menu.dsw
+	rm -f ../../samples/mfc/mfc.dsw
+	rm -f ../../samples/minifram/minifram.dsw
+	rm -f ../../samples/minimal/minimal.dsw
+	rm -f ../../samples/mobile/mobile.dsw
+	rm -f ../../samples/multimon/multimon.dsw
+	rm -f ../../samples/nativdlg/nativdlg.dsw
+	rm -f ../../samples/newgrid/newgrid.dsw
+	rm -f ../../samples/notebook/notebook.dsw
+	rm -f ../../samples/oleauto/oleauto.dsw
+	rm -f ../../samples/opengl/cube/cube.dsw
+	rm -f ../../samples/ownerdrw/ownerdrw.dsw
+	rm -f ../../samples/png/png.dsw
+	rm -f ../../samples/printing/printing.dsw
+	rm -f ../../samples/propsize/propsize.dsw
+	rm -f ../../samples/regtest/regtest.dsw
+	rm -f ../../samples/richedit/richedit.dsw
+	rm -f ../../samples/rotate/rotate.dsw
+	rm -f ../../samples/sashtest/sashtest.dsw
+	rm -f ../../samples/scroll/scroll.dsw
+	rm -f ../../samples/scrollsub/scrollsub.dsw
+	rm -f ../../samples/shaped/shaped.dsw
+	rm -f ../../samples/sockets/sockets.dsw
+	rm -f ../../samples/splitter/splitter.dsw
+	rm -f ../../samples/statbar/statbar.dsw
+	rm -f ../../samples/tab/tab.dsw
+	rm -f ../../samples/taskbar/taskbar.dsw
+	rm -f ../../samples/text/text.dsw
+	rm -f ../../samples/thread/thread.dsw
+	rm -f ../../samples/toolbar/toolbar.dsw
+	rm -f ../../samples/treectrl/treectrl.dsw
+	rm -f ../../samples/typetest/typetest.dsw
+	rm -f ../../samples/validate/validate.dsw
+	rm -f ../../samples/vscroll/vscroll.dsw
+	rm -f ../../samples/widgets/widgets.dsw
+	rm -f ../../samples/wizard/wizard.dsw
+	rm -f ../../samples/wxtest/wxtest.dsw
+	rm -f ../wx.dsw
+	rm -f ../../contrib/build/animate/makefile.wat
+	rm -f ../../contrib/build/fl/makefile.wat
+	rm -f ../../contrib/build/gizmos/makefile.wat
+	rm -f ../../contrib/build/ogl/makefile.wat
+	rm -f ../../contrib/build/stc/makefile.wat
+	rm -f ../../contrib/build/svg/makefile.wat
+	rm -f ../../contrib/build/xrc/makefile.wat
+	rm -f ../../contrib/samples/animate/makefile.wat
+	rm -f ../../contrib/samples/svg/makefile.wat
+	rm -f ../../contrib/samples/xrc/makefile.wat
+	rm -f ../../contrib/utils/wxrc/makefile.wat
+	rm -f ../../samples/access/makefile.wat
+	rm -f ../../samples/artprov/makefile.wat
+	rm -f ../../samples/calendar/makefile.wat
+	rm -f ../../samples/caret/makefile.wat
+	rm -f ../../samples/checklst/makefile.wat
+	rm -f ../../samples/config/makefile.wat
+	rm -f ../../samples/console/makefile.wat
+	rm -f ../../samples/controls/makefile.wat
+	rm -f ../../samples/db/makefile.wat
+	rm -f ../../samples/dialogs/makefile.wat
+	rm -f ../../samples/dialup/makefile.wat
+	rm -f ../../samples/display/makefile.wat
+	rm -f ../../samples/dnd/makefile.wat
+	rm -f ../../samples/docview/makefile.wat
+	rm -f ../../samples/docvwmdi/makefile.wat
+	rm -f ../../samples/dragimag/makefile.wat
+	rm -f ../../samples/drawing/makefile.wat
+	rm -f ../../samples/dynamic/makefile.wat
+	rm -f ../../samples/erase/makefile.wat
+	rm -f ../../samples/event/makefile.wat
+	rm -f ../../samples/exec/makefile.wat
+	rm -f ../../samples/font/makefile.wat
+	rm -f ../../samples/grid/makefile.wat
+	rm -f ../../samples/help/makefile.wat
+	rm -f ../../samples/htlbox/makefile.wat
+	rm -f ../../samples/html/about/makefile.wat
+	rm -f ../../samples/html/help/makefile.wat
+	rm -f ../../samples/html/helpview/makefile.wat
+	rm -f ../../samples/html/makefile.wat
+	rm -f ../../samples/html/printing/makefile.wat
+	rm -f ../../samples/html/test/makefile.wat
+	rm -f ../../samples/html/virtual/makefile.wat
+	rm -f ../../samples/html/widget/makefile.wat
+	rm -f ../../samples/html/zip/makefile.wat
+	rm -f ../../samples/image/makefile.wat
+	rm -f ../../samples/internat/makefile.wat
+	rm -f ../../samples/ipc/makefile.wat
+	rm -f ../../samples/joytest/makefile.wat
+	rm -f ../../samples/keyboard/makefile.wat
+	rm -f ../../samples/layout/makefile.wat
+	rm -f ../../samples/listbox/makefile.wat
+	rm -f ../../samples/listctrl/makefile.wat
+	rm -f ../../samples/makefile.wat
+	rm -f ../../samples/mdi/makefile.wat
+	rm -f ../../samples/memcheck/makefile.wat
+	rm -f ../../samples/menu/makefile.wat
+	rm -f ../../samples/mfc/makefile.wat
+	rm -f ../../samples/minifram/makefile.wat
 	rm -f ../../samples/minimal/makefile.wat
-	rm -f ../../samples/mobile/Makefile.in
-	rm -f ../../samples/mobile/makefile.bcc
-	rm -f ../../samples/mobile/makefile.gcc
-	rm -f ../../samples/mobile/makefile.vc
 	rm -f ../../samples/mobile/makefile.wat
-	rm -f ../../samples/multimon/Makefile.in
-	rm -f ../../samples/multimon/makefile.bcc
-	rm -f ../../samples/multimon/makefile.gcc
-	rm -f ../../samples/multimon/makefile.vc
 	rm -f ../../samples/multimon/makefile.wat
-	rm -f ../../samples/nativdlg/Makefile.in
-	rm -f ../../samples/nativdlg/makefile.bcc
-	rm -f ../../samples/nativdlg/makefile.gcc
-	rm -f ../../samples/nativdlg/makefile.vc
 	rm -f ../../samples/nativdlg/makefile.wat
-	rm -f ../../samples/newgrid/Makefile.in
-	rm -f ../../samples/newgrid/makefile.bcc
-	rm -f ../../samples/newgrid/makefile.gcc
-	rm -f ../../samples/newgrid/makefile.vc
 	rm -f ../../samples/newgrid/makefile.wat
-	rm -f ../../samples/notebook/Makefile.in
-	rm -f ../../samples/notebook/makefile.bcc
-	rm -f ../../samples/notebook/makefile.gcc
-	rm -f ../../samples/notebook/makefile.vc
 	rm -f ../../samples/notebook/makefile.wat
-	rm -f ../../samples/oleauto/Makefile.in
-	rm -f ../../samples/oleauto/makefile.bcc
-	rm -f ../../samples/oleauto/makefile.gcc
-	rm -f ../../samples/oleauto/makefile.vc
 	rm -f ../../samples/oleauto/makefile.wat
-	rm -f ../../samples/opengl/Makefile.in
-	rm -f ../../samples/opengl/makefile.bcc
-	rm -f ../../samples/opengl/makefile.gcc
-	rm -f ../../samples/opengl/makefile.vc
+	rm -f ../../samples/opengl/cube/makefile.wat
 	rm -f ../../samples/opengl/makefile.wat
-	rm -f ../../samples/ownerdrw/Makefile.in
-	rm -f ../../samples/ownerdrw/makefile.bcc
-	rm -f ../../samples/ownerdrw/makefile.gcc
-	rm -f ../../samples/ownerdrw/makefile.vc
 	rm -f ../../samples/ownerdrw/makefile.wat
-	rm -f ../../samples/png/Makefile.in
-	rm -f ../../samples/png/makefile.bcc
-	rm -f ../../samples/png/makefile.gcc
-	rm -f ../../samples/png/makefile.vc
 	rm -f ../../samples/png/makefile.wat
-	rm -f ../../samples/printing/Makefile.in
-	rm -f ../../samples/printing/makefile.bcc
-	rm -f ../../samples/printing/makefile.gcc
-	rm -f ../../samples/printing/makefile.vc
 	rm -f ../../samples/printing/makefile.wat
-	rm -f ../../samples/propsize/Makefile.in
-	rm -f ../../samples/propsize/makefile.bcc
-	rm -f ../../samples/propsize/makefile.gcc
-	rm -f ../../samples/propsize/makefile.vc
 	rm -f ../../samples/propsize/makefile.wat
-	rm -f ../../samples/regtest/Makefile.in
-	rm -f ../../samples/regtest/makefile.bcc
-	rm -f ../../samples/regtest/makefile.gcc
-	rm -f ../../samples/regtest/makefile.vc
 	rm -f ../../samples/regtest/makefile.wat
-	rm -f ../../samples/richedit/Makefile.in
-	rm -f ../../samples/richedit/makefile.bcc
-	rm -f ../../samples/richedit/makefile.gcc
-	rm -f ../../samples/richedit/makefile.vc
 	rm -f ../../samples/richedit/makefile.wat
-	rm -f ../../samples/rotate/Makefile.in
-	rm -f ../../samples/rotate/makefile.bcc
-	rm -f ../../samples/rotate/makefile.gcc
-	rm -f ../../samples/rotate/makefile.vc
 	rm -f ../../samples/rotate/makefile.wat
-	rm -f ../../samples/sashtest/Makefile.in
-	rm -f ../../samples/sashtest/makefile.bcc
-	rm -f ../../samples/sashtest/makefile.gcc
-	rm -f ../../samples/sashtest/makefile.vc
 	rm -f ../../samples/sashtest/makefile.wat
-	rm -f ../../samples/scroll/Makefile.in
-	rm -f ../../samples/scroll/makefile.bcc
-	rm -f ../../samples/scroll/makefile.gcc
-	rm -f ../../samples/scroll/makefile.vc
 	rm -f ../../samples/scroll/makefile.wat
-	rm -f ../../samples/scrollsub/Makefile.in
-	rm -f ../../samples/scrollsub/makefile.bcc
-	rm -f ../../samples/scrollsub/makefile.gcc
-	rm -f ../../samples/scrollsub/makefile.vc
 	rm -f ../../samples/scrollsub/makefile.wat
-	rm -f ../../samples/shaped/Makefile.in
-	rm -f ../../samples/shaped/makefile.bcc
-	rm -f ../../samples/shaped/makefile.gcc
-	rm -f ../../samples/shaped/makefile.vc
 	rm -f ../../samples/shaped/makefile.wat
-	rm -f ../../samples/sockets/Makefile.in
-	rm -f ../../samples/sockets/makefile.bcc
-	rm -f ../../samples/sockets/makefile.gcc
-	rm -f ../../samples/sockets/makefile.vc
 	rm -f ../../samples/sockets/makefile.wat
-	rm -f ../../samples/splitter/Makefile.in
-	rm -f ../../samples/splitter/makefile.bcc
-	rm -f ../../samples/splitter/makefile.gcc
-	rm -f ../../samples/splitter/makefile.vc
 	rm -f ../../samples/splitter/makefile.wat
-	rm -f ../../samples/statbar/Makefile.in
-	rm -f ../../samples/statbar/makefile.bcc
-	rm -f ../../samples/statbar/makefile.gcc
-	rm -f ../../samples/statbar/makefile.vc
 	rm -f ../../samples/statbar/makefile.wat
-	rm -f ../../samples/tab/Makefile.in
-	rm -f ../../samples/tab/makefile.bcc
-	rm -f ../../samples/tab/makefile.gcc
-	rm -f ../../samples/tab/makefile.vc
 	rm -f ../../samples/tab/makefile.wat
-	rm -f ../../samples/taskbar/Makefile.in
-	rm -f ../../samples/taskbar/makefile.bcc
-	rm -f ../../samples/taskbar/makefile.gcc
-	rm -f ../../samples/taskbar/makefile.vc
 	rm -f ../../samples/taskbar/makefile.wat
-	rm -f ../../samples/text/Makefile.in
-	rm -f ../../samples/text/makefile.bcc
-	rm -f ../../samples/text/makefile.gcc
-	rm -f ../../samples/text/makefile.vc
 	rm -f ../../samples/text/makefile.wat
-	rm -f ../../samples/thread/Makefile.in
-	rm -f ../../samples/thread/makefile.bcc
-	rm -f ../../samples/thread/makefile.gcc
-	rm -f ../../samples/thread/makefile.vc
 	rm -f ../../samples/thread/makefile.wat
-	rm -f ../../samples/toolbar/Makefile.in
-	rm -f ../../samples/toolbar/makefile.bcc
-	rm -f ../../samples/toolbar/makefile.gcc
-	rm -f ../../samples/toolbar/makefile.vc
 	rm -f ../../samples/toolbar/makefile.wat
-	rm -f ../../samples/treectrl/Makefile.in
-	rm -f ../../samples/treectrl/makefile.bcc
-	rm -f ../../samples/treectrl/makefile.gcc
-	rm -f ../../samples/treectrl/makefile.vc
 	rm -f ../../samples/treectrl/makefile.wat
-	rm -f ../../samples/typetest/Makefile.in
-	rm -f ../../samples/typetest/makefile.bcc
-	rm -f ../../samples/typetest/makefile.gcc
-	rm -f ../../samples/typetest/makefile.vc
 	rm -f ../../samples/typetest/makefile.wat
-	rm -f ../../samples/validate/Makefile.in
-	rm -f ../../samples/validate/makefile.bcc
-	rm -f ../../samples/validate/makefile.gcc
-	rm -f ../../samples/validate/makefile.vc
 	rm -f ../../samples/validate/makefile.wat
-	rm -f ../../samples/vscroll/Makefile.in
-	rm -f ../../samples/vscroll/makefile.bcc
-	rm -f ../../samples/vscroll/makefile.gcc
-	rm -f ../../samples/vscroll/makefile.vc
 	rm -f ../../samples/vscroll/makefile.wat
-	rm -f ../../samples/widgets/Makefile.in
-	rm -f ../../samples/widgets/makefile.bcc
-	rm -f ../../samples/widgets/makefile.gcc
-	rm -f ../../samples/widgets/makefile.vc
 	rm -f ../../samples/widgets/makefile.wat
-	rm -f ../../samples/wizard/Makefile.in
-	rm -f ../../samples/wizard/makefile.bcc
-	rm -f ../../samples/wizard/makefile.gcc
-	rm -f ../../samples/wizard/makefile.vc
 	rm -f ../../samples/wizard/makefile.wat
-	rm -f ../../samples/wxtest/Makefile.in
-	rm -f ../../samples/wxtest/makefile.bcc
-	rm -f ../../samples/wxtest/makefile.gcc
-	rm -f ../../samples/wxtest/makefile.vc
 	rm -f ../../samples/wxtest/makefile.wat
-	rm -f ../makefile.bcc
-	rm -f ../makefile.gcc
-	rm -f ../makefile.vc
 	rm -f ../makefile.wat
 
 
+library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc
+
 ../../autoconf_inc.m4: ../../Makefile.in
-../../configure: ../../autoconf_inc.m4
-	(cd ../.. ; aclocal && autoconf)
 
 Makefile: regenMakefile.py
 	./regenMakefile.py
@@ -965,6 +1193,9 @@ Makefile: regenMakefile.py
 ../../contrib/build/animate/makefile.wat: $(CDEPS) ../../contrib/build/animate/animate.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/animate -DWXTOPDIR=../../../ ../../contrib/build/animate/animate.bkl
 	touch $@
+../../contrib/build/animate/animate.dsw: $(CDEPS) ../../contrib/build/animate/animate.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DSRCDIR=../../src/animate -DWXTOPDIR=../../../ ../../contrib/build/animate/animate.bkl
+	touch $@
 
 
 ../../contrib/src/fl/Makefile.in: $(CDEPS) ../../contrib/build/fl/fl.bkl
@@ -982,6 +1213,9 @@ Makefile: regenMakefile.py
 ../../contrib/build/fl/makefile.wat: $(CDEPS) ../../contrib/build/fl/fl.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
 	touch $@
+../../contrib/build/fl/fl.dsw: $(CDEPS) ../../contrib/build/fl/fl.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
+	touch $@
 
 
 ../../contrib/src/gizmos/Makefile.in: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl
@@ -999,6 +1233,9 @@ Makefile: regenMakefile.py
 ../../contrib/build/gizmos/makefile.wat: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/gizmos -DWXTOPDIR=../../../ ../../contrib/build/gizmos/gizmos.bkl
 	touch $@
+../../contrib/build/gizmos/gizmos.dsw: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DSRCDIR=../../src/gizmos -DWXTOPDIR=../../../ ../../contrib/build/gizmos/gizmos.bkl
+	touch $@
 
 
 ../../contrib/src/ogl/Makefile.in: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
@@ -1016,6 +1253,9 @@ Makefile: regenMakefile.py
 ../../contrib/build/ogl/makefile.wat: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/ogl -DWXTOPDIR=../../../ ../../contrib/build/ogl/ogl.bkl
 	touch $@
+../../contrib/build/ogl/ogl.dsw: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DSRCDIR=../../src/ogl -DWXTOPDIR=../../../ ../../contrib/build/ogl/ogl.bkl
+	touch $@
 
 
 ../../contrib/src/stc/Makefile.in: $(CDEPS) ../../contrib/build/stc/stc.bkl
@@ -1033,6 +1273,29 @@ Makefile: regenMakefile.py
 ../../contrib/build/stc/makefile.wat: $(CDEPS) ../../contrib/build/stc/stc.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
 	touch $@
+../../contrib/build/stc/stc.dsw: $(CDEPS) ../../contrib/build/stc/stc.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
+	touch $@
+
+
+../../contrib/src/svg/Makefile.in: $(CDEPS) ../../contrib/build/svg/svg.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/svg/svg.bkl
+	touch $@
+../../contrib/build/svg/makefile.bcc: $(CDEPS) ../../contrib/build/svg/svg.bkl
+	$(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg -DWXTOPDIR=../../../ ../../contrib/build/svg/svg.bkl
+	touch $@
+../../contrib/build/svg/makefile.vc: $(CDEPS) ../../contrib/build/svg/svg.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg -DWXTOPDIR=../../../ ../../contrib/build/svg/svg.bkl
+	touch $@
+../../contrib/build/svg/makefile.gcc: $(CDEPS) ../../contrib/build/svg/svg.bkl
+	$(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg -DWXTOPDIR=../../../ ../../contrib/build/svg/svg.bkl
+	touch $@
+../../contrib/build/svg/makefile.wat: $(CDEPS) ../../contrib/build/svg/svg.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg -DWXTOPDIR=../../../ ../../contrib/build/svg/svg.bkl
+	touch $@
+../../contrib/build/svg/svg.dsw: $(CDEPS) ../../contrib/build/svg/svg.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DSRCDIR=../../src/svg -DWXTOPDIR=../../../ ../../contrib/build/svg/svg.bkl
+	touch $@
 
 
 ../../contrib/src/xrc/Makefile.in: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
@@ -1050,6 +1313,9 @@ Makefile: regenMakefile.py
 ../../contrib/build/xrc/makefile.wat: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
 	touch $@
+../../contrib/build/xrc/xrc.dsw: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
+	touch $@
 
 
 ../../contrib/samples/animate/Makefile.in: $(SDEPS) ../../contrib/samples/animate/anitest.bkl
@@ -1067,6 +1333,29 @@ Makefile: regenMakefile.py
 ../../contrib/samples/animate/makefile.wat: $(SDEPS) ../../contrib/samples/animate/anitest.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/animate/anitest.bkl
 	touch $@
+../../contrib/samples/animate/anitest.dsw: $(SDEPS) ../../contrib/samples/animate/anitest.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../contrib/samples/animate/anitest.bkl
+	touch $@
+
+
+../../contrib/samples/svg/Makefile.in: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/svg/svgtest.bkl
+	touch $@
+../../contrib/samples/svg/makefile.bcc: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl
+	$(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/svg/svgtest.bkl
+	touch $@
+../../contrib/samples/svg/makefile.vc: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/svg/svgtest.bkl
+	touch $@
+../../contrib/samples/svg/makefile.gcc: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl
+	$(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/svg/svgtest.bkl
+	touch $@
+../../contrib/samples/svg/makefile.wat: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/svg/svgtest.bkl
+	touch $@
+../../contrib/samples/svg/svgtest.dsw: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../contrib/samples/svg/svgtest.bkl
+	touch $@
 
 
 ../../contrib/samples/xrc/Makefile.in: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
@@ -1084,6 +1373,29 @@ Makefile: regenMakefile.py
 ../../contrib/samples/xrc/makefile.wat: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
 	touch $@
+../../contrib/samples/xrc/xrcdemo.dsw: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+	touch $@
+
+
+../../contrib/utils/wxrc/Makefile.in: $(SDEPS) ../../contrib/utils/wxrc/wxrc.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/utils/wxrc/wxrc.bkl
+	touch $@
+../../contrib/utils/wxrc/makefile.bcc: $(SDEPS) ../../contrib/utils/wxrc/wxrc.bkl
+	$(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/utils/wxrc/wxrc.bkl
+	touch $@
+../../contrib/utils/wxrc/makefile.vc: $(SDEPS) ../../contrib/utils/wxrc/wxrc.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/utils/wxrc/wxrc.bkl
+	touch $@
+../../contrib/utils/wxrc/makefile.gcc: $(SDEPS) ../../contrib/utils/wxrc/wxrc.bkl
+	$(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/utils/wxrc/wxrc.bkl
+	touch $@
+../../contrib/utils/wxrc/makefile.wat: $(SDEPS) ../../contrib/utils/wxrc/wxrc.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/utils/wxrc/wxrc.bkl
+	touch $@
+../../contrib/utils/wxrc/wxrc.dsw: $(SDEPS) ../../contrib/utils/wxrc/wxrc.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../contrib/utils/wxrc/wxrc.bkl
+	touch $@
 
 
 ../../samples/access/Makefile.in: $(SDEPS) ../../samples/access/access.bkl
@@ -1101,6 +1413,9 @@ Makefile: regenMakefile.py
 ../../samples/access/makefile.wat: $(SDEPS) ../../samples/access/access.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/access/access.bkl
 	touch $@
+../../samples/access/access.dsw: $(SDEPS) ../../samples/access/access.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/access/access.bkl
+	touch $@
 
 
 ../../samples/artprov/Makefile.in: $(SDEPS) ../../samples/artprov/artprov.bkl
@@ -1118,6 +1433,9 @@ Makefile: regenMakefile.py
 ../../samples/artprov/makefile.wat: $(SDEPS) ../../samples/artprov/artprov.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
 	touch $@
+../../samples/artprov/artprov.dsw: $(SDEPS) ../../samples/artprov/artprov.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
+	touch $@
 
 
 ../../samples/calendar/Makefile.in: $(SDEPS) ../../samples/calendar/calendar.bkl
@@ -1135,6 +1453,9 @@ Makefile: regenMakefile.py
 ../../samples/calendar/makefile.wat: $(SDEPS) ../../samples/calendar/calendar.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
 	touch $@
+../../samples/calendar/calendar.dsw: $(SDEPS) ../../samples/calendar/calendar.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
+	touch $@
 
 
 ../../samples/caret/Makefile.in: $(SDEPS) ../../samples/caret/caret.bkl
@@ -1152,6 +1473,9 @@ Makefile: regenMakefile.py
 ../../samples/caret/makefile.wat: $(SDEPS) ../../samples/caret/caret.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
 	touch $@
+../../samples/caret/caret.dsw: $(SDEPS) ../../samples/caret/caret.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
+	touch $@
 
 
 ../../samples/checklst/Makefile.in: $(SDEPS) ../../samples/checklst/checklst.bkl
@@ -1169,6 +1493,9 @@ Makefile: regenMakefile.py
 ../../samples/checklst/makefile.wat: $(SDEPS) ../../samples/checklst/checklst.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
 	touch $@
+../../samples/checklst/checklst.dsw: $(SDEPS) ../../samples/checklst/checklst.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
+	touch $@
 
 
 ../../samples/config/Makefile.in: $(SDEPS) ../../samples/config/config.bkl
@@ -1186,6 +1513,9 @@ Makefile: regenMakefile.py
 ../../samples/config/makefile.wat: $(SDEPS) ../../samples/config/config.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/config/config.bkl
 	touch $@
+../../samples/config/config.dsw: $(SDEPS) ../../samples/config/config.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/config/config.bkl
+	touch $@
 
 
 ../../samples/console/Makefile.in: $(SDEPS) ../../samples/console/console.bkl
@@ -1203,6 +1533,9 @@ Makefile: regenMakefile.py
 ../../samples/console/makefile.wat: $(SDEPS) ../../samples/console/console.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/console/console.bkl
 	touch $@
+../../samples/console/console.dsw: $(SDEPS) ../../samples/console/console.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/console/console.bkl
+	touch $@
 
 
 ../../samples/controls/Makefile.in: $(SDEPS) ../../samples/controls/controls.bkl
@@ -1220,6 +1553,9 @@ Makefile: regenMakefile.py
 ../../samples/controls/makefile.wat: $(SDEPS) ../../samples/controls/controls.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
 	touch $@
+../../samples/controls/controls.dsw: $(SDEPS) ../../samples/controls/controls.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
+	touch $@
 
 
 ../../samples/db/Makefile.in: $(SDEPS) ../../samples/db/db.bkl
@@ -1237,6 +1573,9 @@ Makefile: regenMakefile.py
 ../../samples/db/makefile.wat: $(SDEPS) ../../samples/db/db.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/db/db.bkl
 	touch $@
+../../samples/db/db.dsw: $(SDEPS) ../../samples/db/db.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/db/db.bkl
+	touch $@
 
 
 ../../samples/dialogs/Makefile.in: $(SDEPS) ../../samples/dialogs/dialogs.bkl
@@ -1254,6 +1593,9 @@ Makefile: regenMakefile.py
 ../../samples/dialogs/makefile.wat: $(SDEPS) ../../samples/dialogs/dialogs.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dialogs/dialogs.bkl
 	touch $@
+../../samples/dialogs/dialogs.dsw: $(SDEPS) ../../samples/dialogs/dialogs.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/dialogs/dialogs.bkl
+	touch $@
 
 
 ../../samples/dialup/Makefile.in: $(SDEPS) ../../samples/dialup/dialup.bkl
@@ -1271,6 +1613,9 @@ Makefile: regenMakefile.py
 ../../samples/dialup/makefile.wat: $(SDEPS) ../../samples/dialup/dialup.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
 	touch $@
+../../samples/dialup/dialup.dsw: $(SDEPS) ../../samples/dialup/dialup.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
+	touch $@
 
 
 ../../samples/display/Makefile.in: $(SDEPS) ../../samples/display/display.bkl
@@ -1288,6 +1633,9 @@ Makefile: regenMakefile.py
 ../../samples/display/makefile.wat: $(SDEPS) ../../samples/display/display.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/display/display.bkl
 	touch $@
+../../samples/display/display.dsw: $(SDEPS) ../../samples/display/display.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/display/display.bkl
+	touch $@
 
 
 ../../samples/dnd/Makefile.in: $(SDEPS) ../../samples/dnd/dnd.bkl
@@ -1305,6 +1653,9 @@ Makefile: regenMakefile.py
 ../../samples/dnd/makefile.wat: $(SDEPS) ../../samples/dnd/dnd.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
 	touch $@
+../../samples/dnd/dnd.dsw: $(SDEPS) ../../samples/dnd/dnd.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
+	touch $@
 
 
 ../../samples/docview/Makefile.in: $(SDEPS) ../../samples/docview/docview.bkl
@@ -1322,6 +1673,9 @@ Makefile: regenMakefile.py
 ../../samples/docview/makefile.wat: $(SDEPS) ../../samples/docview/docview.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
 	touch $@
+../../samples/docview/docview.dsw: $(SDEPS) ../../samples/docview/docview.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
+	touch $@
 
 
 ../../samples/docvwmdi/Makefile.in: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
@@ -1339,6 +1693,9 @@ Makefile: regenMakefile.py
 ../../samples/docvwmdi/makefile.wat: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
 	touch $@
+../../samples/docvwmdi/docvwmdi.dsw: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
+	touch $@
 
 
 ../../samples/dragimag/Makefile.in: $(SDEPS) ../../samples/dragimag/dragimag.bkl
@@ -1356,6 +1713,9 @@ Makefile: regenMakefile.py
 ../../samples/dragimag/makefile.wat: $(SDEPS) ../../samples/dragimag/dragimag.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
 	touch $@
+../../samples/dragimag/dragimag.dsw: $(SDEPS) ../../samples/dragimag/dragimag.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
+	touch $@
 
 
 ../../samples/drawing/Makefile.in: $(SDEPS) ../../samples/drawing/drawing.bkl
@@ -1373,6 +1733,9 @@ Makefile: regenMakefile.py
 ../../samples/drawing/makefile.wat: $(SDEPS) ../../samples/drawing/drawing.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
 	touch $@
+../../samples/drawing/drawing.dsw: $(SDEPS) ../../samples/drawing/drawing.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+	touch $@
 
 
 ../../samples/dynamic/Makefile.in: $(SDEPS) ../../samples/dynamic/dynamic.bkl
@@ -1390,6 +1753,9 @@ Makefile: regenMakefile.py
 ../../samples/dynamic/makefile.wat: $(SDEPS) ../../samples/dynamic/dynamic.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
 	touch $@
+../../samples/dynamic/dynamic.dsw: $(SDEPS) ../../samples/dynamic/dynamic.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
+	touch $@
 
 
 ../../samples/erase/Makefile.in: $(SDEPS) ../../samples/erase/erase.bkl
@@ -1407,6 +1773,9 @@ Makefile: regenMakefile.py
 ../../samples/erase/makefile.wat: $(SDEPS) ../../samples/erase/erase.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/erase/erase.bkl
 	touch $@
+../../samples/erase/erase.dsw: $(SDEPS) ../../samples/erase/erase.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/erase/erase.bkl
+	touch $@
 
 
 ../../samples/event/Makefile.in: $(SDEPS) ../../samples/event/event.bkl
@@ -1424,6 +1793,9 @@ Makefile: regenMakefile.py
 ../../samples/event/makefile.wat: $(SDEPS) ../../samples/event/event.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/event/event.bkl
 	touch $@
+../../samples/event/event.dsw: $(SDEPS) ../../samples/event/event.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/event/event.bkl
+	touch $@
 
 
 ../../samples/exec/Makefile.in: $(SDEPS) ../../samples/exec/exec.bkl
@@ -1441,6 +1813,9 @@ Makefile: regenMakefile.py
 ../../samples/exec/makefile.wat: $(SDEPS) ../../samples/exec/exec.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
 	touch $@
+../../samples/exec/exec.dsw: $(SDEPS) ../../samples/exec/exec.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
+	touch $@
 
 
 ../../samples/font/Makefile.in: $(SDEPS) ../../samples/font/font.bkl
@@ -1458,6 +1833,9 @@ Makefile: regenMakefile.py
 ../../samples/font/makefile.wat: $(SDEPS) ../../samples/font/font.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/font/font.bkl
 	touch $@
+../../samples/font/font.dsw: $(SDEPS) ../../samples/font/font.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/font/font.bkl
+	touch $@
 
 
 ../../samples/grid/Makefile.in: $(SDEPS) ../../samples/grid/grid.bkl
@@ -1475,6 +1853,9 @@ Makefile: regenMakefile.py
 ../../samples/grid/makefile.wat: $(SDEPS) ../../samples/grid/grid.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
 	touch $@
+../../samples/grid/grid.dsw: $(SDEPS) ../../samples/grid/grid.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
+	touch $@
 
 
 ../../samples/help/Makefile.in: $(SDEPS) ../../samples/help/help.bkl
@@ -1492,6 +1873,9 @@ Makefile: regenMakefile.py
 ../../samples/help/makefile.wat: $(SDEPS) ../../samples/help/help.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/help/help.bkl
 	touch $@
+../../samples/help/help.dsw: $(SDEPS) ../../samples/help/help.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/help/help.bkl
+	touch $@
 
 
 ../../samples/htlbox/Makefile.in: $(SDEPS) ../../samples/htlbox/htlbox.bkl
@@ -1509,6 +1893,9 @@ Makefile: regenMakefile.py
 ../../samples/htlbox/makefile.wat: $(SDEPS) ../../samples/htlbox/htlbox.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
 	touch $@
+../../samples/htlbox/htlbox.dsw: $(SDEPS) ../../samples/htlbox/htlbox.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
+	touch $@
 
 
 ../../samples/html/about/Makefile.in: $(SDEPS) ../../samples/html/about/about.bkl
@@ -1526,6 +1913,9 @@ Makefile: regenMakefile.py
 ../../samples/html/about/makefile.wat: $(SDEPS) ../../samples/html/about/about.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
 	touch $@
+../../samples/html/about/about.dsw: $(SDEPS) ../../samples/html/about/about.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
+	touch $@
 
 
 ../../samples/html/help/Makefile.in: $(SDEPS) ../../samples/html/help/help.bkl
@@ -1543,6 +1933,9 @@ Makefile: regenMakefile.py
 ../../samples/html/help/makefile.wat: $(SDEPS) ../../samples/html/help/help.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
 	touch $@
+../../samples/html/help/help.dsw: $(SDEPS) ../../samples/html/help/help.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
+	touch $@
 
 
 ../../samples/html/helpview/Makefile.in: $(SDEPS) ../../samples/html/helpview/helpview.bkl
@@ -1560,6 +1953,9 @@ Makefile: regenMakefile.py
 ../../samples/html/helpview/makefile.wat: $(SDEPS) ../../samples/html/helpview/helpview.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
 	touch $@
+../../samples/html/helpview/helpview.dsw: $(SDEPS) ../../samples/html/helpview/helpview.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
+	touch $@
 
 
 ../../samples/html/Makefile.in: $(SDEPS) ../../samples/html/html_samples.bkl
@@ -1594,6 +1990,9 @@ Makefile: regenMakefile.py
 ../../samples/html/printing/makefile.wat: $(SDEPS) ../../samples/html/printing/printing.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
 	touch $@
+../../samples/html/printing/printing.dsw: $(SDEPS) ../../samples/html/printing/printing.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
+	touch $@
 
 
 ../../samples/html/test/Makefile.in: $(SDEPS) ../../samples/html/test/test.bkl
@@ -1611,6 +2010,9 @@ Makefile: regenMakefile.py
 ../../samples/html/test/makefile.wat: $(SDEPS) ../../samples/html/test/test.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
 	touch $@
+../../samples/html/test/test.dsw: $(SDEPS) ../../samples/html/test/test.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
+	touch $@
 
 
 ../../samples/html/virtual/Makefile.in: $(SDEPS) ../../samples/html/virtual/virtual.bkl
@@ -1628,6 +2030,9 @@ Makefile: regenMakefile.py
 ../../samples/html/virtual/makefile.wat: $(SDEPS) ../../samples/html/virtual/virtual.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
 	touch $@
+../../samples/html/virtual/virtual.dsw: $(SDEPS) ../../samples/html/virtual/virtual.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
+	touch $@
 
 
 ../../samples/html/widget/Makefile.in: $(SDEPS) ../../samples/html/widget/widget.bkl
@@ -1645,6 +2050,9 @@ Makefile: regenMakefile.py
 ../../samples/html/widget/makefile.wat: $(SDEPS) ../../samples/html/widget/widget.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
 	touch $@
+../../samples/html/widget/widget.dsw: $(SDEPS) ../../samples/html/widget/widget.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
+	touch $@
 
 
 ../../samples/html/zip/Makefile.in: $(SDEPS) ../../samples/html/zip/zip.bkl
@@ -1662,6 +2070,9 @@ Makefile: regenMakefile.py
 ../../samples/html/zip/makefile.wat: $(SDEPS) ../../samples/html/zip/zip.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
 	touch $@
+../../samples/html/zip/zip.dsw: $(SDEPS) ../../samples/html/zip/zip.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
+	touch $@
 
 
 ../../samples/image/Makefile.in: $(SDEPS) ../../samples/image/image.bkl
@@ -1679,6 +2090,9 @@ Makefile: regenMakefile.py
 ../../samples/image/makefile.wat: $(SDEPS) ../../samples/image/image.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/image/image.bkl
 	touch $@
+../../samples/image/image.dsw: $(SDEPS) ../../samples/image/image.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/image/image.bkl
+	touch $@
 
 
 ../../samples/internat/Makefile.in: $(SDEPS) ../../samples/internat/internat.bkl
@@ -1696,6 +2110,9 @@ Makefile: regenMakefile.py
 ../../samples/internat/makefile.wat: $(SDEPS) ../../samples/internat/internat.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
 	touch $@
+../../samples/internat/internat.dsw: $(SDEPS) ../../samples/internat/internat.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
+	touch $@
 
 
 ../../samples/ipc/Makefile.in: $(SDEPS) ../../samples/ipc/ipc.bkl
@@ -1713,6 +2130,9 @@ Makefile: regenMakefile.py
 ../../samples/ipc/makefile.wat: $(SDEPS) ../../samples/ipc/ipc.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
 	touch $@
+../../samples/ipc/ipc.dsw: $(SDEPS) ../../samples/ipc/ipc.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
+	touch $@
 
 
 ../../samples/joytest/Makefile.in: $(SDEPS) ../../samples/joytest/joytest.bkl
@@ -1730,6 +2150,9 @@ Makefile: regenMakefile.py
 ../../samples/joytest/makefile.wat: $(SDEPS) ../../samples/joytest/joytest.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
 	touch $@
+../../samples/joytest/joytest.dsw: $(SDEPS) ../../samples/joytest/joytest.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
+	touch $@
 
 
 ../../samples/keyboard/Makefile.in: $(SDEPS) ../../samples/keyboard/keyboard.bkl
@@ -1747,6 +2170,9 @@ Makefile: regenMakefile.py
 ../../samples/keyboard/makefile.wat: $(SDEPS) ../../samples/keyboard/keyboard.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
 	touch $@
+../../samples/keyboard/keyboard.dsw: $(SDEPS) ../../samples/keyboard/keyboard.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
+	touch $@
 
 
 ../../samples/layout/Makefile.in: $(SDEPS) ../../samples/layout/layout.bkl
@@ -1764,6 +2190,9 @@ Makefile: regenMakefile.py
 ../../samples/layout/makefile.wat: $(SDEPS) ../../samples/layout/layout.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/layout/layout.bkl
 	touch $@
+../../samples/layout/layout.dsw: $(SDEPS) ../../samples/layout/layout.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/layout/layout.bkl
+	touch $@
 
 
 ../../samples/listbox/Makefile.in: $(SDEPS) ../../samples/listbox/listbox.bkl
@@ -1781,6 +2210,9 @@ Makefile: regenMakefile.py
 ../../samples/listbox/makefile.wat: $(SDEPS) ../../samples/listbox/listbox.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
 	touch $@
+../../samples/listbox/listbox.dsw: $(SDEPS) ../../samples/listbox/listbox.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
+	touch $@
 
 
 ../../samples/listctrl/Makefile.in: $(SDEPS) ../../samples/listctrl/listctrl.bkl
@@ -1798,6 +2230,9 @@ Makefile: regenMakefile.py
 ../../samples/listctrl/makefile.wat: $(SDEPS) ../../samples/listctrl/listctrl.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
 	touch $@
+../../samples/listctrl/listctrl.dsw: $(SDEPS) ../../samples/listctrl/listctrl.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+	touch $@
 
 
 ../../samples/mdi/Makefile.in: $(SDEPS) ../../samples/mdi/mdi.bkl
@@ -1815,6 +2250,9 @@ Makefile: regenMakefile.py
 ../../samples/mdi/makefile.wat: $(SDEPS) ../../samples/mdi/mdi.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
 	touch $@
+../../samples/mdi/mdi.dsw: $(SDEPS) ../../samples/mdi/mdi.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+	touch $@
 
 
 ../../samples/memcheck/Makefile.in: $(SDEPS) ../../samples/memcheck/memcheck.bkl
@@ -1832,6 +2270,9 @@ Makefile: regenMakefile.py
 ../../samples/memcheck/makefile.wat: $(SDEPS) ../../samples/memcheck/memcheck.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
 	touch $@
+../../samples/memcheck/memcheck.dsw: $(SDEPS) ../../samples/memcheck/memcheck.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
+	touch $@
 
 
 ../../samples/menu/Makefile.in: $(SDEPS) ../../samples/menu/menu.bkl
@@ -1849,6 +2290,9 @@ Makefile: regenMakefile.py
 ../../samples/menu/makefile.wat: $(SDEPS) ../../samples/menu/menu.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
 	touch $@
+../../samples/menu/menu.dsw: $(SDEPS) ../../samples/menu/menu.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
+	touch $@
 
 
 ../../samples/mfc/Makefile.in: $(SDEPS) ../../samples/mfc/mfc.bkl
@@ -1866,6 +2310,9 @@ Makefile: regenMakefile.py
 ../../samples/mfc/makefile.wat: $(SDEPS) ../../samples/mfc/mfc.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
 	touch $@
+../../samples/mfc/mfc.dsw: $(SDEPS) ../../samples/mfc/mfc.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+	touch $@
 
 
 ../../samples/minifram/Makefile.in: $(SDEPS) ../../samples/minifram/minifram.bkl
@@ -1883,6 +2330,9 @@ Makefile: regenMakefile.py
 ../../samples/minifram/makefile.wat: $(SDEPS) ../../samples/minifram/minifram.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/minifram/minifram.bkl
 	touch $@
+../../samples/minifram/minifram.dsw: $(SDEPS) ../../samples/minifram/minifram.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/minifram/minifram.bkl
+	touch $@
 
 
 ../../samples/minimal/Makefile.in: $(SDEPS) ../../samples/minimal/minimal.bkl
@@ -1900,6 +2350,9 @@ Makefile: regenMakefile.py
 ../../samples/minimal/makefile.wat: $(SDEPS) ../../samples/minimal/minimal.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
 	touch $@
+../../samples/minimal/minimal.dsw: $(SDEPS) ../../samples/minimal/minimal.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
+	touch $@
 
 
 ../../samples/mobile/Makefile.in: $(SDEPS) ../../samples/mobile/mobile.bkl
@@ -1917,6 +2370,9 @@ Makefile: regenMakefile.py
 ../../samples/mobile/makefile.wat: $(SDEPS) ../../samples/mobile/mobile.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mobile/mobile.bkl
 	touch $@
+../../samples/mobile/mobile.dsw: $(SDEPS) ../../samples/mobile/mobile.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/mobile/mobile.bkl
+	touch $@
 
 
 ../../samples/multimon/Makefile.in: $(SDEPS) ../../samples/multimon/multimon.bkl
@@ -1934,6 +2390,9 @@ Makefile: regenMakefile.py
 ../../samples/multimon/makefile.wat: $(SDEPS) ../../samples/multimon/multimon.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
 	touch $@
+../../samples/multimon/multimon.dsw: $(SDEPS) ../../samples/multimon/multimon.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
+	touch $@
 
 
 ../../samples/nativdlg/Makefile.in: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
@@ -1951,6 +2410,9 @@ Makefile: regenMakefile.py
 ../../samples/nativdlg/makefile.wat: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
 	touch $@
+../../samples/nativdlg/nativdlg.dsw: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
+	touch $@
 
 
 ../../samples/newgrid/Makefile.in: $(SDEPS) ../../samples/newgrid/newgrid.bkl
@@ -1968,6 +2430,9 @@ Makefile: regenMakefile.py
 ../../samples/newgrid/makefile.wat: $(SDEPS) ../../samples/newgrid/newgrid.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
 	touch $@
+../../samples/newgrid/newgrid.dsw: $(SDEPS) ../../samples/newgrid/newgrid.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
+	touch $@
 
 
 ../../samples/notebook/Makefile.in: $(SDEPS) ../../samples/notebook/notebook.bkl
@@ -1985,6 +2450,9 @@ Makefile: regenMakefile.py
 ../../samples/notebook/makefile.wat: $(SDEPS) ../../samples/notebook/notebook.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
 	touch $@
+../../samples/notebook/notebook.dsw: $(SDEPS) ../../samples/notebook/notebook.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
+	touch $@
 
 
 ../../samples/oleauto/Makefile.in: $(SDEPS) ../../samples/oleauto/oleauto.bkl
@@ -2002,22 +2470,45 @@ Makefile: regenMakefile.py
 ../../samples/oleauto/makefile.wat: $(SDEPS) ../../samples/oleauto/oleauto.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/oleauto/oleauto.bkl
 	touch $@
+../../samples/oleauto/oleauto.dsw: $(SDEPS) ../../samples/oleauto/oleauto.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/oleauto/oleauto.bkl
+	touch $@
+
+
+../../samples/opengl/cube/Makefile.in: $(SDEPS) ../../samples/opengl/cube/cube.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/cube/cube.bkl
+	touch $@
+../../samples/opengl/cube/makefile.bcc: $(SDEPS) ../../samples/opengl/cube/cube.bkl
+	$(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/opengl/cube/cube.bkl
+	touch $@
+../../samples/opengl/cube/makefile.vc: $(SDEPS) ../../samples/opengl/cube/cube.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/opengl/cube/cube.bkl
+	touch $@
+../../samples/opengl/cube/makefile.gcc: $(SDEPS) ../../samples/opengl/cube/cube.bkl
+	$(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/opengl/cube/cube.bkl
+	touch $@
+../../samples/opengl/cube/makefile.wat: $(SDEPS) ../../samples/opengl/cube/cube.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/opengl/cube/cube.bkl
+	touch $@
+../../samples/opengl/cube/cube.dsw: $(SDEPS) ../../samples/opengl/cube/cube.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../../ ../../samples/opengl/cube/cube.bkl
+	touch $@
 
 
-../../samples/opengl/Makefile.in: $(SDEPS) ../../samples/opengl/opengl.bkl
-	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/opengl.bkl
+../../samples/opengl/Makefile.in: $(SDEPS) ../../samples/opengl/opengl_samples.bkl
+	$(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/opengl_samples.bkl
 	touch $@
-../../samples/opengl/makefile.bcc: $(SDEPS) ../../samples/opengl/opengl.bkl
-	$(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
+../../samples/opengl/makefile.bcc: $(SDEPS) ../../samples/opengl/opengl_samples.bkl
+	$(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/opengl/opengl_samples.bkl
 	touch $@
-../../samples/opengl/makefile.vc: $(SDEPS) ../../samples/opengl/opengl.bkl
-	$(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
+../../samples/opengl/makefile.vc: $(SDEPS) ../../samples/opengl/opengl_samples.bkl
+	$(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/opengl/opengl_samples.bkl
 	touch $@
-../../samples/opengl/makefile.gcc: $(SDEPS) ../../samples/opengl/opengl.bkl
-	$(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
+../../samples/opengl/makefile.gcc: $(SDEPS) ../../samples/opengl/opengl_samples.bkl
+	$(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/opengl/opengl_samples.bkl
 	touch $@
-../../samples/opengl/makefile.wat: $(SDEPS) ../../samples/opengl/opengl.bkl
-	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
+../../samples/opengl/makefile.wat: $(SDEPS) ../../samples/opengl/opengl_samples.bkl
+	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/opengl/opengl_samples.bkl
 	touch $@
 
 
@@ -2036,6 +2527,9 @@ Makefile: regenMakefile.py
 ../../samples/ownerdrw/makefile.wat: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/ownerdrw/ownerdrw.bkl
 	touch $@
+../../samples/ownerdrw/ownerdrw.dsw: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/ownerdrw/ownerdrw.bkl
+	touch $@
 
 
 ../../samples/png/Makefile.in: $(SDEPS) ../../samples/png/png.bkl
@@ -2053,6 +2547,9 @@ Makefile: regenMakefile.py
 ../../samples/png/makefile.wat: $(SDEPS) ../../samples/png/png.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/png/png.bkl
 	touch $@
+../../samples/png/png.dsw: $(SDEPS) ../../samples/png/png.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/png/png.bkl
+	touch $@
 
 
 ../../samples/printing/Makefile.in: $(SDEPS) ../../samples/printing/printing.bkl
@@ -2070,6 +2567,9 @@ Makefile: regenMakefile.py
 ../../samples/printing/makefile.wat: $(SDEPS) ../../samples/printing/printing.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
 	touch $@
+../../samples/printing/printing.dsw: $(SDEPS) ../../samples/printing/printing.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
+	touch $@
 
 
 ../../samples/propsize/Makefile.in: $(SDEPS) ../../samples/propsize/propsize.bkl
@@ -2087,6 +2587,9 @@ Makefile: regenMakefile.py
 ../../samples/propsize/makefile.wat: $(SDEPS) ../../samples/propsize/propsize.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
 	touch $@
+../../samples/propsize/propsize.dsw: $(SDEPS) ../../samples/propsize/propsize.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
+	touch $@
 
 
 ../../samples/regtest/Makefile.in: $(SDEPS) ../../samples/regtest/regtest.bkl
@@ -2104,6 +2607,9 @@ Makefile: regenMakefile.py
 ../../samples/regtest/makefile.wat: $(SDEPS) ../../samples/regtest/regtest.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
 	touch $@
+../../samples/regtest/regtest.dsw: $(SDEPS) ../../samples/regtest/regtest.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
+	touch $@
 
 
 ../../samples/richedit/Makefile.in: $(SDEPS) ../../samples/richedit/richedit.bkl
@@ -2121,6 +2627,9 @@ Makefile: regenMakefile.py
 ../../samples/richedit/makefile.wat: $(SDEPS) ../../samples/richedit/richedit.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
 	touch $@
+../../samples/richedit/richedit.dsw: $(SDEPS) ../../samples/richedit/richedit.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
+	touch $@
 
 
 ../../samples/rotate/Makefile.in: $(SDEPS) ../../samples/rotate/rotate.bkl
@@ -2138,6 +2647,9 @@ Makefile: regenMakefile.py
 ../../samples/rotate/makefile.wat: $(SDEPS) ../../samples/rotate/rotate.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
 	touch $@
+../../samples/rotate/rotate.dsw: $(SDEPS) ../../samples/rotate/rotate.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+	touch $@
 
 
 ../../samples/Makefile.in: ../../samples/samples.bkl
@@ -2172,6 +2684,9 @@ Makefile: regenMakefile.py
 ../../samples/sashtest/makefile.wat: $(SDEPS) ../../samples/sashtest/sashtest.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
 	touch $@
+../../samples/sashtest/sashtest.dsw: $(SDEPS) ../../samples/sashtest/sashtest.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+	touch $@
 
 
 ../../samples/scroll/Makefile.in: $(SDEPS) ../../samples/scroll/scroll.bkl
@@ -2189,6 +2704,9 @@ Makefile: regenMakefile.py
 ../../samples/scroll/makefile.wat: $(SDEPS) ../../samples/scroll/scroll.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
 	touch $@
+../../samples/scroll/scroll.dsw: $(SDEPS) ../../samples/scroll/scroll.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+	touch $@
 
 
 ../../samples/scrollsub/Makefile.in: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
@@ -2206,6 +2724,9 @@ Makefile: regenMakefile.py
 ../../samples/scrollsub/makefile.wat: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
 	touch $@
+../../samples/scrollsub/scrollsub.dsw: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+	touch $@
 
 
 ../../samples/shaped/Makefile.in: $(SDEPS) ../../samples/shaped/shaped.bkl
@@ -2223,6 +2744,9 @@ Makefile: regenMakefile.py
 ../../samples/shaped/makefile.wat: $(SDEPS) ../../samples/shaped/shaped.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
 	touch $@
+../../samples/shaped/shaped.dsw: $(SDEPS) ../../samples/shaped/shaped.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
+	touch $@
 
 
 ../../samples/sockets/Makefile.in: $(SDEPS) ../../samples/sockets/sockets.bkl
@@ -2240,6 +2764,9 @@ Makefile: regenMakefile.py
 ../../samples/sockets/makefile.wat: $(SDEPS) ../../samples/sockets/sockets.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
 	touch $@
+../../samples/sockets/sockets.dsw: $(SDEPS) ../../samples/sockets/sockets.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
+	touch $@
 
 
 ../../samples/splitter/Makefile.in: $(SDEPS) ../../samples/splitter/splitter.bkl
@@ -2257,6 +2784,9 @@ Makefile: regenMakefile.py
 ../../samples/splitter/makefile.wat: $(SDEPS) ../../samples/splitter/splitter.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
 	touch $@
+../../samples/splitter/splitter.dsw: $(SDEPS) ../../samples/splitter/splitter.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
+	touch $@
 
 
 ../../samples/statbar/Makefile.in: $(SDEPS) ../../samples/statbar/statbar.bkl
@@ -2274,6 +2804,9 @@ Makefile: regenMakefile.py
 ../../samples/statbar/makefile.wat: $(SDEPS) ../../samples/statbar/statbar.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
 	touch $@
+../../samples/statbar/statbar.dsw: $(SDEPS) ../../samples/statbar/statbar.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
+	touch $@
 
 
 ../../samples/tab/Makefile.in: $(SDEPS) ../../samples/tab/tab.bkl
@@ -2291,6 +2824,9 @@ Makefile: regenMakefile.py
 ../../samples/tab/makefile.wat: $(SDEPS) ../../samples/tab/tab.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
 	touch $@
+../../samples/tab/tab.dsw: $(SDEPS) ../../samples/tab/tab.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+	touch $@
 
 
 ../../samples/taskbar/Makefile.in: $(SDEPS) ../../samples/taskbar/taskbar.bkl
@@ -2308,6 +2844,9 @@ Makefile: regenMakefile.py
 ../../samples/taskbar/makefile.wat: $(SDEPS) ../../samples/taskbar/taskbar.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
 	touch $@
+../../samples/taskbar/taskbar.dsw: $(SDEPS) ../../samples/taskbar/taskbar.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
+	touch $@
 
 
 ../../samples/text/Makefile.in: $(SDEPS) ../../samples/text/text.bkl
@@ -2325,6 +2864,9 @@ Makefile: regenMakefile.py
 ../../samples/text/makefile.wat: $(SDEPS) ../../samples/text/text.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/text/text.bkl
 	touch $@
+../../samples/text/text.dsw: $(SDEPS) ../../samples/text/text.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/text/text.bkl
+	touch $@
 
 
 ../../samples/thread/Makefile.in: $(SDEPS) ../../samples/thread/thread.bkl
@@ -2342,6 +2884,9 @@ Makefile: regenMakefile.py
 ../../samples/thread/makefile.wat: $(SDEPS) ../../samples/thread/thread.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
 	touch $@
+../../samples/thread/thread.dsw: $(SDEPS) ../../samples/thread/thread.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
+	touch $@
 
 
 ../../samples/toolbar/Makefile.in: $(SDEPS) ../../samples/toolbar/toolbar.bkl
@@ -2359,6 +2904,9 @@ Makefile: regenMakefile.py
 ../../samples/toolbar/makefile.wat: $(SDEPS) ../../samples/toolbar/toolbar.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
 	touch $@
+../../samples/toolbar/toolbar.dsw: $(SDEPS) ../../samples/toolbar/toolbar.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
+	touch $@
 
 
 ../../samples/treectrl/Makefile.in: $(SDEPS) ../../samples/treectrl/treectrl.bkl
@@ -2376,6 +2924,9 @@ Makefile: regenMakefile.py
 ../../samples/treectrl/makefile.wat: $(SDEPS) ../../samples/treectrl/treectrl.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
 	touch $@
+../../samples/treectrl/treectrl.dsw: $(SDEPS) ../../samples/treectrl/treectrl.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+	touch $@
 
 
 ../../samples/typetest/Makefile.in: $(SDEPS) ../../samples/typetest/typetest.bkl
@@ -2393,6 +2944,9 @@ Makefile: regenMakefile.py
 ../../samples/typetest/makefile.wat: $(SDEPS) ../../samples/typetest/typetest.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
 	touch $@
+../../samples/typetest/typetest.dsw: $(SDEPS) ../../samples/typetest/typetest.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+	touch $@
 
 
 ../../samples/validate/Makefile.in: $(SDEPS) ../../samples/validate/validate.bkl
@@ -2410,6 +2964,9 @@ Makefile: regenMakefile.py
 ../../samples/validate/makefile.wat: $(SDEPS) ../../samples/validate/validate.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/validate/validate.bkl
 	touch $@
+../../samples/validate/validate.dsw: $(SDEPS) ../../samples/validate/validate.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/validate/validate.bkl
+	touch $@
 
 
 ../../samples/vscroll/Makefile.in: $(SDEPS) ../../samples/vscroll/vscroll.bkl
@@ -2427,6 +2984,9 @@ Makefile: regenMakefile.py
 ../../samples/vscroll/makefile.wat: $(SDEPS) ../../samples/vscroll/vscroll.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
 	touch $@
+../../samples/vscroll/vscroll.dsw: $(SDEPS) ../../samples/vscroll/vscroll.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
+	touch $@
 
 
 ../../samples/widgets/Makefile.in: $(SDEPS) ../../samples/widgets/widgets.bkl
@@ -2444,6 +3004,9 @@ Makefile: regenMakefile.py
 ../../samples/widgets/makefile.wat: $(SDEPS) ../../samples/widgets/widgets.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/widgets/widgets.bkl
 	touch $@
+../../samples/widgets/widgets.dsw: $(SDEPS) ../../samples/widgets/widgets.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/widgets/widgets.bkl
+	touch $@
 
 
 ../../samples/wizard/Makefile.in: $(SDEPS) ../../samples/wizard/wizard.bkl
@@ -2461,6 +3024,9 @@ Makefile: regenMakefile.py
 ../../samples/wizard/makefile.wat: $(SDEPS) ../../samples/wizard/wizard.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
 	touch $@
+../../samples/wizard/wizard.dsw: $(SDEPS) ../../samples/wizard/wizard.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
+	touch $@
 
 
 ../../samples/wxtest/Makefile.in: $(SDEPS) ../../samples/wxtest/wxtest.bkl
@@ -2478,6 +3044,9 @@ Makefile: regenMakefile.py
 ../../samples/wxtest/makefile.wat: $(SDEPS) ../../samples/wxtest/wxtest.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
 	touch $@
+../../samples/wxtest/wxtest.dsw: $(SDEPS) ../../samples/wxtest/wxtest.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
+	touch $@
 
 
 ../../Makefile.in: $(MDEPS) wx.bkl
@@ -2495,3 +3064,6 @@ Makefile: regenMakefile.py
 ../makefile.wat: $(MDEPS) wx.bkl
 	$(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=config.wat wx.bkl
 	touch $@
+../wx.dsw: $(MDEPS) wx.bkl
+	$(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) wx.bkl
+	touch $@