added HelpGen bakefile

[wxWidgets.git] / build / bakefiles / Makefile

diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index 6b5ec47dd825652b0352af03848a086e01111594..d39aabc8cd997263d345d28831acaec1ce27bf32 100644 (file)
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -10,21 +10,49 @@ MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl w
 
 DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \
            -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \
 
 DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \
            -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \

-           -DDEBUG_INFO=default -DDEBUG_FLAG=default
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default -DMSLU=0
+
+COMPAT_TARGETS = ../../src/wxWindows.dsp
+

 AUTOCONF_ALL = \
        ../../Makefile.in \
        ../../contrib/samples/animate/Makefile.in \
 AUTOCONF_ALL = \
        ../../Makefile.in \
        ../../contrib/samples/animate/Makefile.in \

+       ../../contrib/samples/deprecated/proplist/Makefile.in \
+       ../../contrib/samples/deprecated/resource/Makefile.in \
+       ../../contrib/samples/deprecated/treelay/Makefile.in \
+       ../../contrib/samples/fl/Makefile.in \
+       ../../contrib/samples/gizmos/dynsash/Makefile.in \
+       ../../contrib/samples/gizmos/dynsash_switch/Makefile.in \
+       ../../contrib/samples/gizmos/editlbox/Makefile.in \
+       ../../contrib/samples/gizmos/led/Makefile.in \
+       ../../contrib/samples/gizmos/multicell/Makefile.in \
+       ../../contrib/samples/gizmos/splittree/Makefile.in \
+       ../../contrib/samples/mmedia/Makefile.in \
+       ../../contrib/samples/ogl/ogledit/Makefile.in \
+       ../../contrib/samples/ogl/studio/Makefile.in \
+       ../../contrib/samples/plot/Makefile.in \
+       ../../contrib/samples/stc/Makefile.in \

        ../../contrib/samples/svg/Makefile.in \
        ../../contrib/samples/xrc/Makefile.in \
        ../../contrib/src/animate/Makefile.in \
        ../../contrib/samples/svg/Makefile.in \
        ../../contrib/samples/xrc/Makefile.in \
        ../../contrib/src/animate/Makefile.in \

+       ../../contrib/src/deprecated/Makefile.in \

        ../../contrib/src/fl/Makefile.in \
        ../../contrib/src/gizmos/Makefile.in \
        ../../contrib/src/fl/Makefile.in \
        ../../contrib/src/gizmos/Makefile.in \

+       ../../contrib/src/mmedia/Makefile.in \
+       ../../contrib/src/net/Makefile.in \

        ../../contrib/src/ogl/Makefile.in \
        ../../contrib/src/ogl/Makefile.in \

+       ../../contrib/src/plot/Makefile.in \

        ../../contrib/src/stc/Makefile.in \
        ../../contrib/src/svg/Makefile.in \
        ../../contrib/src/xrc/Makefile.in \
        ../../contrib/utils/wxrc/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 \
+       ../../demos/Makefile.in \
+       ../../demos/bombs/Makefile.in \
+       ../../demos/dbbrowse/Makefile.in \
+       ../../demos/forty/Makefile.in \
+       ../../demos/fractal/Makefile.in \
+       ../../demos/life/Makefile.in \
+       ../../demos/poem/Makefile.in \

        ../../samples/access/Makefile.in \
        ../../samples/artprov/Makefile.in \
        ../../samples/calendar/Makefile.in \
        ../../samples/access/Makefile.in \
        ../../samples/artprov/Makefile.in \
        ../../samples/calendar/Makefile.in \


@@ -74,18 +102,22 @@ AUTOCONF_ALL = \
        ../../samples/minifram/Makefile.in \
        ../../samples/minimal/Makefile.in \
        ../../samples/mobile/Makefile.in \
        ../../samples/minifram/Makefile.in \
        ../../samples/minimal/Makefile.in \
        ../../samples/mobile/Makefile.in \

+       ../../samples/mobile/styles/Makefile.in \
+       ../../samples/mobile/wxedit/Makefile.in \

        ../../samples/multimon/Makefile.in \
        ../../samples/nativdlg/Makefile.in \
        ../../samples/multimon/Makefile.in \
        ../../samples/nativdlg/Makefile.in \

-       ../../samples/newgrid/Makefile.in \

        ../../samples/notebook/Makefile.in \
        ../../samples/oleauto/Makefile.in \
        ../../samples/opengl/Makefile.in \
        ../../samples/opengl/cube/Makefile.in \
        ../../samples/notebook/Makefile.in \
        ../../samples/oleauto/Makefile.in \
        ../../samples/opengl/Makefile.in \
        ../../samples/opengl/cube/Makefile.in \

+       ../../samples/opengl/isosurf/Makefile.in \
+       ../../samples/opengl/penguin/Makefile.in \

        ../../samples/ownerdrw/Makefile.in \
        ../../samples/png/Makefile.in \
        ../../samples/printing/Makefile.in \
        ../../samples/propsize/Makefile.in \
        ../../samples/regtest/Makefile.in \
        ../../samples/ownerdrw/Makefile.in \
        ../../samples/png/Makefile.in \
        ../../samples/printing/Makefile.in \
        ../../samples/propsize/Makefile.in \
        ../../samples/regtest/Makefile.in \

+       ../../samples/render/Makefile.in \

        ../../samples/richedit/Makefile.in \
        ../../samples/rotate/Makefile.in \
        ../../samples/sashtest/Makefile.in \
        ../../samples/richedit/Makefile.in \
        ../../samples/rotate/Makefile.in \
        ../../samples/sashtest/Makefile.in \


@@ -106,19 +138,46 @@ AUTOCONF_ALL = \
        ../../samples/vscroll/Makefile.in \
        ../../samples/widgets/Makefile.in \
        ../../samples/wizard/Makefile.in \
        ../../samples/vscroll/Makefile.in \
        ../../samples/widgets/Makefile.in \
        ../../samples/wizard/Makefile.in \

-       ../../samples/wxtest/Makefile.in
+       ../../samples/wxtest/Makefile.in \
+       ../../utils/HelpGen/Makefile.in

 BORLAND_ALL = \
        ../../contrib/build/animate/makefile.bcc \
 BORLAND_ALL = \
        ../../contrib/build/animate/makefile.bcc \

+       ../../contrib/build/deprecated/makefile.bcc \

        ../../contrib/build/fl/makefile.bcc \
        ../../contrib/build/gizmos/makefile.bcc \
        ../../contrib/build/fl/makefile.bcc \
        ../../contrib/build/gizmos/makefile.bcc \

+       ../../contrib/build/mmedia/makefile.bcc \
+       ../../contrib/build/net/makefile.bcc \

        ../../contrib/build/ogl/makefile.bcc \
        ../../contrib/build/ogl/makefile.bcc \

+       ../../contrib/build/plot/makefile.bcc \

        ../../contrib/build/stc/makefile.bcc \
        ../../contrib/build/svg/makefile.bcc \
        ../../contrib/build/xrc/makefile.bcc \
        ../../contrib/samples/animate/makefile.bcc \
        ../../contrib/build/stc/makefile.bcc \
        ../../contrib/build/svg/makefile.bcc \
        ../../contrib/build/xrc/makefile.bcc \
        ../../contrib/samples/animate/makefile.bcc \

+       ../../contrib/samples/deprecated/proplist/makefile.bcc \
+       ../../contrib/samples/deprecated/resource/makefile.bcc \
+       ../../contrib/samples/deprecated/treelay/makefile.bcc \
+       ../../contrib/samples/fl/makefile.bcc \
+       ../../contrib/samples/gizmos/dynsash/makefile.bcc \
+       ../../contrib/samples/gizmos/dynsash_switch/makefile.bcc \
+       ../../contrib/samples/gizmos/editlbox/makefile.bcc \
+       ../../contrib/samples/gizmos/led/makefile.bcc \
+       ../../contrib/samples/gizmos/multicell/makefile.bcc \
+       ../../contrib/samples/gizmos/splittree/makefile.bcc \
+       ../../contrib/samples/mmedia/makefile.bcc \
+       ../../contrib/samples/ogl/ogledit/makefile.bcc \
+       ../../contrib/samples/ogl/studio/makefile.bcc \
+       ../../contrib/samples/plot/makefile.bcc \
+       ../../contrib/samples/stc/makefile.bcc \

        ../../contrib/samples/svg/makefile.bcc \
        ../../contrib/samples/xrc/makefile.bcc \
        ../../contrib/utils/wxrc/makefile.bcc \
        ../../contrib/samples/svg/makefile.bcc \
        ../../contrib/samples/xrc/makefile.bcc \
        ../../contrib/utils/wxrc/makefile.bcc \

+       ../../demos/bombs/makefile.bcc \
+       ../../demos/dbbrowse/makefile.bcc \
+       ../../demos/forty/makefile.bcc \
+       ../../demos/fractal/makefile.bcc \
+       ../../demos/life/makefile.bcc \
+       ../../demos/makefile.bcc \
+       ../../demos/poem/makefile.bcc \

        ../../samples/access/makefile.bcc \
        ../../samples/artprov/makefile.bcc \
        ../../samples/calendar/makefile.bcc \
        ../../samples/access/makefile.bcc \
        ../../samples/artprov/makefile.bcc \
        ../../samples/calendar/makefile.bcc \


@@ -169,18 +228,22 @@ BORLAND_ALL = \
        ../../samples/minifram/makefile.bcc \
        ../../samples/minimal/makefile.bcc \
        ../../samples/mobile/makefile.bcc \
        ../../samples/minifram/makefile.bcc \
        ../../samples/minimal/makefile.bcc \
        ../../samples/mobile/makefile.bcc \

+       ../../samples/mobile/styles/makefile.bcc \
+       ../../samples/mobile/wxedit/makefile.bcc \

        ../../samples/multimon/makefile.bcc \
        ../../samples/nativdlg/makefile.bcc \
        ../../samples/multimon/makefile.bcc \
        ../../samples/nativdlg/makefile.bcc \

-       ../../samples/newgrid/makefile.bcc \

        ../../samples/notebook/makefile.bcc \
        ../../samples/oleauto/makefile.bcc \
        ../../samples/opengl/cube/makefile.bcc \
        ../../samples/notebook/makefile.bcc \
        ../../samples/oleauto/makefile.bcc \
        ../../samples/opengl/cube/makefile.bcc \

+       ../../samples/opengl/isosurf/makefile.bcc \

        ../../samples/opengl/makefile.bcc \
        ../../samples/opengl/makefile.bcc \

+       ../../samples/opengl/penguin/makefile.bcc \

        ../../samples/ownerdrw/makefile.bcc \
        ../../samples/png/makefile.bcc \
        ../../samples/printing/makefile.bcc \
        ../../samples/propsize/makefile.bcc \
        ../../samples/regtest/makefile.bcc \
        ../../samples/ownerdrw/makefile.bcc \
        ../../samples/png/makefile.bcc \
        ../../samples/printing/makefile.bcc \
        ../../samples/propsize/makefile.bcc \
        ../../samples/regtest/makefile.bcc \

+       ../../samples/render/makefile.bcc \

        ../../samples/richedit/makefile.bcc \
        ../../samples/rotate/makefile.bcc \
        ../../samples/sashtest/makefile.bcc \
        ../../samples/richedit/makefile.bcc \
        ../../samples/rotate/makefile.bcc \
        ../../samples/sashtest/makefile.bcc \


@@ -202,19 +265,46 @@ BORLAND_ALL = \
        ../../samples/widgets/makefile.bcc \
        ../../samples/wizard/makefile.bcc \
        ../../samples/wxtest/makefile.bcc \
        ../../samples/widgets/makefile.bcc \
        ../../samples/wizard/makefile.bcc \
        ../../samples/wxtest/makefile.bcc \

-       ../makefile.bcc
+       ../../utils/HelpGen/makefile.bcc \
+       ../msw/makefile.bcc

 MINGW_ALL = \
        ../../contrib/build/animate/makefile.gcc \
 MINGW_ALL = \
        ../../contrib/build/animate/makefile.gcc \

+       ../../contrib/build/deprecated/makefile.gcc \

        ../../contrib/build/fl/makefile.gcc \
        ../../contrib/build/gizmos/makefile.gcc \
        ../../contrib/build/fl/makefile.gcc \
        ../../contrib/build/gizmos/makefile.gcc \

+       ../../contrib/build/mmedia/makefile.gcc \
+       ../../contrib/build/net/makefile.gcc \

        ../../contrib/build/ogl/makefile.gcc \
        ../../contrib/build/ogl/makefile.gcc \

+       ../../contrib/build/plot/makefile.gcc \

        ../../contrib/build/stc/makefile.gcc \
        ../../contrib/build/svg/makefile.gcc \
        ../../contrib/build/xrc/makefile.gcc \
        ../../contrib/samples/animate/makefile.gcc \
        ../../contrib/build/stc/makefile.gcc \
        ../../contrib/build/svg/makefile.gcc \
        ../../contrib/build/xrc/makefile.gcc \
        ../../contrib/samples/animate/makefile.gcc \

+       ../../contrib/samples/deprecated/proplist/makefile.gcc \
+       ../../contrib/samples/deprecated/resource/makefile.gcc \
+       ../../contrib/samples/deprecated/treelay/makefile.gcc \
+       ../../contrib/samples/fl/makefile.gcc \
+       ../../contrib/samples/gizmos/dynsash/makefile.gcc \
+       ../../contrib/samples/gizmos/dynsash_switch/makefile.gcc \
+       ../../contrib/samples/gizmos/editlbox/makefile.gcc \
+       ../../contrib/samples/gizmos/led/makefile.gcc \
+       ../../contrib/samples/gizmos/multicell/makefile.gcc \
+       ../../contrib/samples/gizmos/splittree/makefile.gcc \
+       ../../contrib/samples/mmedia/makefile.gcc \
+       ../../contrib/samples/ogl/ogledit/makefile.gcc \
+       ../../contrib/samples/ogl/studio/makefile.gcc \
+       ../../contrib/samples/plot/makefile.gcc \
+       ../../contrib/samples/stc/makefile.gcc \

        ../../contrib/samples/svg/makefile.gcc \
        ../../contrib/samples/xrc/makefile.gcc \
        ../../contrib/utils/wxrc/makefile.gcc \
        ../../contrib/samples/svg/makefile.gcc \
        ../../contrib/samples/xrc/makefile.gcc \
        ../../contrib/utils/wxrc/makefile.gcc \

+       ../../demos/bombs/makefile.gcc \
+       ../../demos/dbbrowse/makefile.gcc \
+       ../../demos/forty/makefile.gcc \
+       ../../demos/fractal/makefile.gcc \
+       ../../demos/life/makefile.gcc \
+       ../../demos/makefile.gcc \
+       ../../demos/poem/makefile.gcc \

        ../../samples/access/makefile.gcc \
        ../../samples/artprov/makefile.gcc \
        ../../samples/calendar/makefile.gcc \
        ../../samples/access/makefile.gcc \
        ../../samples/artprov/makefile.gcc \
        ../../samples/calendar/makefile.gcc \


@@ -265,18 +355,22 @@ MINGW_ALL = \
        ../../samples/minifram/makefile.gcc \
        ../../samples/minimal/makefile.gcc \
        ../../samples/mobile/makefile.gcc \
        ../../samples/minifram/makefile.gcc \
        ../../samples/minimal/makefile.gcc \
        ../../samples/mobile/makefile.gcc \

+       ../../samples/mobile/styles/makefile.gcc \
+       ../../samples/mobile/wxedit/makefile.gcc \

        ../../samples/multimon/makefile.gcc \
        ../../samples/nativdlg/makefile.gcc \
        ../../samples/multimon/makefile.gcc \
        ../../samples/nativdlg/makefile.gcc \

-       ../../samples/newgrid/makefile.gcc \

        ../../samples/notebook/makefile.gcc \
        ../../samples/oleauto/makefile.gcc \
        ../../samples/opengl/cube/makefile.gcc \
        ../../samples/notebook/makefile.gcc \
        ../../samples/oleauto/makefile.gcc \
        ../../samples/opengl/cube/makefile.gcc \

+       ../../samples/opengl/isosurf/makefile.gcc \

        ../../samples/opengl/makefile.gcc \
        ../../samples/opengl/makefile.gcc \

+       ../../samples/opengl/penguin/makefile.gcc \

        ../../samples/ownerdrw/makefile.gcc \
        ../../samples/png/makefile.gcc \
        ../../samples/printing/makefile.gcc \
        ../../samples/propsize/makefile.gcc \
        ../../samples/regtest/makefile.gcc \
        ../../samples/ownerdrw/makefile.gcc \
        ../../samples/png/makefile.gcc \
        ../../samples/printing/makefile.gcc \
        ../../samples/propsize/makefile.gcc \
        ../../samples/regtest/makefile.gcc \

+       ../../samples/render/makefile.gcc \

        ../../samples/richedit/makefile.gcc \
        ../../samples/rotate/makefile.gcc \
        ../../samples/sashtest/makefile.gcc \
        ../../samples/richedit/makefile.gcc \
        ../../samples/rotate/makefile.gcc \
        ../../samples/sashtest/makefile.gcc \


@@ -298,19 +392,46 @@ MINGW_ALL = \
        ../../samples/widgets/makefile.gcc \
        ../../samples/wizard/makefile.gcc \
        ../../samples/wxtest/makefile.gcc \
        ../../samples/widgets/makefile.gcc \
        ../../samples/wizard/makefile.gcc \
        ../../samples/wxtest/makefile.gcc \

-       ../makefile.gcc
+       ../../utils/HelpGen/makefile.gcc \
+       ../msw/makefile.gcc

 MSVC_ALL = \
        ../../contrib/build/animate/makefile.vc \
 MSVC_ALL = \
        ../../contrib/build/animate/makefile.vc \

+       ../../contrib/build/deprecated/makefile.vc \

        ../../contrib/build/fl/makefile.vc \
        ../../contrib/build/gizmos/makefile.vc \
        ../../contrib/build/fl/makefile.vc \
        ../../contrib/build/gizmos/makefile.vc \

+       ../../contrib/build/mmedia/makefile.vc \
+       ../../contrib/build/net/makefile.vc \

        ../../contrib/build/ogl/makefile.vc \
        ../../contrib/build/ogl/makefile.vc \

+       ../../contrib/build/plot/makefile.vc \

        ../../contrib/build/stc/makefile.vc \
        ../../contrib/build/svg/makefile.vc \
        ../../contrib/build/xrc/makefile.vc \
        ../../contrib/samples/animate/makefile.vc \
        ../../contrib/build/stc/makefile.vc \
        ../../contrib/build/svg/makefile.vc \
        ../../contrib/build/xrc/makefile.vc \
        ../../contrib/samples/animate/makefile.vc \

+       ../../contrib/samples/deprecated/proplist/makefile.vc \
+       ../../contrib/samples/deprecated/resource/makefile.vc \
+       ../../contrib/samples/deprecated/treelay/makefile.vc \
+       ../../contrib/samples/fl/makefile.vc \
+       ../../contrib/samples/gizmos/dynsash/makefile.vc \
+       ../../contrib/samples/gizmos/dynsash_switch/makefile.vc \
+       ../../contrib/samples/gizmos/editlbox/makefile.vc \
+       ../../contrib/samples/gizmos/led/makefile.vc \
+       ../../contrib/samples/gizmos/multicell/makefile.vc \
+       ../../contrib/samples/gizmos/splittree/makefile.vc \
+       ../../contrib/samples/mmedia/makefile.vc \
+       ../../contrib/samples/ogl/ogledit/makefile.vc \
+       ../../contrib/samples/ogl/studio/makefile.vc \
+       ../../contrib/samples/plot/makefile.vc \
+       ../../contrib/samples/stc/makefile.vc \

        ../../contrib/samples/svg/makefile.vc \
        ../../contrib/samples/xrc/makefile.vc \
        ../../contrib/utils/wxrc/makefile.vc \
        ../../contrib/samples/svg/makefile.vc \
        ../../contrib/samples/xrc/makefile.vc \
        ../../contrib/utils/wxrc/makefile.vc \

+       ../../demos/bombs/makefile.vc \
+       ../../demos/dbbrowse/makefile.vc \
+       ../../demos/forty/makefile.vc \
+       ../../demos/fractal/makefile.vc \
+       ../../demos/life/makefile.vc \
+       ../../demos/makefile.vc \
+       ../../demos/poem/makefile.vc \

        ../../samples/access/makefile.vc \
        ../../samples/artprov/makefile.vc \
        ../../samples/calendar/makefile.vc \
        ../../samples/access/makefile.vc \
        ../../samples/artprov/makefile.vc \
        ../../samples/calendar/makefile.vc \


@@ -361,18 +482,22 @@ MSVC_ALL = \
        ../../samples/minifram/makefile.vc \
        ../../samples/minimal/makefile.vc \
        ../../samples/mobile/makefile.vc \
        ../../samples/minifram/makefile.vc \
        ../../samples/minimal/makefile.vc \
        ../../samples/mobile/makefile.vc \

+       ../../samples/mobile/styles/makefile.vc \
+       ../../samples/mobile/wxedit/makefile.vc \

        ../../samples/multimon/makefile.vc \
        ../../samples/nativdlg/makefile.vc \
        ../../samples/multimon/makefile.vc \
        ../../samples/nativdlg/makefile.vc \

-       ../../samples/newgrid/makefile.vc \

        ../../samples/notebook/makefile.vc \
        ../../samples/oleauto/makefile.vc \
        ../../samples/opengl/cube/makefile.vc \
        ../../samples/notebook/makefile.vc \
        ../../samples/oleauto/makefile.vc \
        ../../samples/opengl/cube/makefile.vc \

+       ../../samples/opengl/isosurf/makefile.vc \

        ../../samples/opengl/makefile.vc \
        ../../samples/opengl/makefile.vc \

+       ../../samples/opengl/penguin/makefile.vc \

        ../../samples/ownerdrw/makefile.vc \
        ../../samples/png/makefile.vc \
        ../../samples/printing/makefile.vc \
        ../../samples/propsize/makefile.vc \
        ../../samples/regtest/makefile.vc \
        ../../samples/ownerdrw/makefile.vc \
        ../../samples/png/makefile.vc \
        ../../samples/printing/makefile.vc \
        ../../samples/propsize/makefile.vc \
        ../../samples/regtest/makefile.vc \

+       ../../samples/render/makefile.vc \

        ../../samples/richedit/makefile.vc \
        ../../samples/rotate/makefile.vc \
        ../../samples/sashtest/makefile.vc \
        ../../samples/richedit/makefile.vc \
        ../../samples/rotate/makefile.vc \
        ../../samples/sashtest/makefile.vc \


@@ -394,19 +519,45 @@ MSVC_ALL = \
        ../../samples/widgets/makefile.vc \
        ../../samples/wizard/makefile.vc \
        ../../samples/wxtest/makefile.vc \
        ../../samples/widgets/makefile.vc \
        ../../samples/wizard/makefile.vc \
        ../../samples/wxtest/makefile.vc \

-       ../makefile.vc
+       ../../utils/HelpGen/makefile.vc \
+       ../msw/makefile.vc

 MSVC6PRJ_ALL = \
        ../../contrib/build/animate/animate.dsw \
 MSVC6PRJ_ALL = \
        ../../contrib/build/animate/animate.dsw \

+       ../../contrib/build/deprecated/deprecated.dsw \

        ../../contrib/build/fl/fl.dsw \
        ../../contrib/build/gizmos/gizmos.dsw \
        ../../contrib/build/fl/fl.dsw \
        ../../contrib/build/gizmos/gizmos.dsw \

+       ../../contrib/build/mmedia/mmedia.dsw \
+       ../../contrib/build/net/netutils.dsw \

        ../../contrib/build/ogl/ogl.dsw \
        ../../contrib/build/ogl/ogl.dsw \

+       ../../contrib/build/plot/plot.dsw \

        ../../contrib/build/stc/stc.dsw \
        ../../contrib/build/svg/svg.dsw \
        ../../contrib/build/xrc/xrc.dsw \
        ../../contrib/samples/animate/anitest.dsw \
        ../../contrib/build/stc/stc.dsw \
        ../../contrib/build/svg/svg.dsw \
        ../../contrib/build/xrc/xrc.dsw \
        ../../contrib/samples/animate/anitest.dsw \

+       ../../contrib/samples/deprecated/proplist/proplist.dsw \
+       ../../contrib/samples/deprecated/resource/resource.dsw \
+       ../../contrib/samples/deprecated/treelay/treelay.dsw \
+       ../../contrib/samples/fl/fl.dsw \
+       ../../contrib/samples/gizmos/dynsash/dynsash.dsw \
+       ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw \
+       ../../contrib/samples/gizmos/editlbox/editlbox.dsw \
+       ../../contrib/samples/gizmos/led/led.dsw \
+       ../../contrib/samples/gizmos/multicell/multicell.dsw \
+       ../../contrib/samples/gizmos/splittree/splittree.dsw \
+       ../../contrib/samples/mmedia/mmboard.dsw \
+       ../../contrib/samples/ogl/ogledit/ogledit.dsw \
+       ../../contrib/samples/ogl/studio/studio.dsw \
+       ../../contrib/samples/plot/plot.dsw \
+       ../../contrib/samples/stc/stctest.dsw \

        ../../contrib/samples/svg/svgtest.dsw \
        ../../contrib/samples/xrc/xrcdemo.dsw \
        ../../contrib/utils/wxrc/wxrc.dsw \
        ../../contrib/samples/svg/svgtest.dsw \
        ../../contrib/samples/xrc/xrcdemo.dsw \
        ../../contrib/utils/wxrc/wxrc.dsw \

+       ../../demos/bombs/bombs.dsw \
+       ../../demos/dbbrowse/dbbrowse.dsw \
+       ../../demos/forty/forty.dsw \
+       ../../demos/fractal/fractal.dsw \
+       ../../demos/life/life.dsw \
+       ../../demos/poem/poem.dsw \

        ../../samples/access/access.dsw \
        ../../samples/artprov/artprov.dsw \
        ../../samples/calendar/calendar.dsw \
        ../../samples/access/access.dsw \
        ../../samples/artprov/artprov.dsw \
        ../../samples/calendar/calendar.dsw \


@@ -454,18 +605,21 @@ MSVC6PRJ_ALL = \
        ../../samples/mfc/mfc.dsw \
        ../../samples/minifram/minifram.dsw \
        ../../samples/minimal/minimal.dsw \
        ../../samples/mfc/mfc.dsw \
        ../../samples/minifram/minifram.dsw \
        ../../samples/minimal/minimal.dsw \

-       ../../samples/mobile/mobile.dsw \
+       ../../samples/mobile/styles/styles.dsw \
+       ../../samples/mobile/wxedit/wxedit.dsw \

        ../../samples/multimon/multimon.dsw \
        ../../samples/nativdlg/nativdlg.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/notebook/notebook.dsw \
        ../../samples/oleauto/oleauto.dsw \
        ../../samples/opengl/cube/cube.dsw \

+       ../../samples/opengl/isosurf/isosurf.dsw \
+       ../../samples/opengl/penguin/penguin.dsw \

        ../../samples/ownerdrw/ownerdrw.dsw \
        ../../samples/png/png.dsw \
        ../../samples/printing/printing.dsw \
        ../../samples/propsize/propsize.dsw \
        ../../samples/regtest/regtest.dsw \
        ../../samples/ownerdrw/ownerdrw.dsw \
        ../../samples/png/png.dsw \
        ../../samples/printing/printing.dsw \
        ../../samples/propsize/propsize.dsw \
        ../../samples/regtest/regtest.dsw \

+       ../../samples/render/render.dsw \

        ../../samples/richedit/richedit.dsw \
        ../../samples/rotate/rotate.dsw \
        ../../samples/sashtest/sashtest.dsw \
        ../../samples/richedit/richedit.dsw \
        ../../samples/rotate/rotate.dsw \
        ../../samples/sashtest/sashtest.dsw \


@@ -487,19 +641,46 @@ MSVC6PRJ_ALL = \
        ../../samples/widgets/widgets.dsw \
        ../../samples/wizard/wizard.dsw \
        ../../samples/wxtest/wxtest.dsw \
        ../../samples/widgets/widgets.dsw \
        ../../samples/wizard/wizard.dsw \
        ../../samples/wxtest/wxtest.dsw \

-       ../wx.dsw
+       ../../utils/HelpGen/helpgen.dsw \
+       ../msw/wx.dsw

 WATCOM_ALL = \
        ../../contrib/build/animate/makefile.wat \
 WATCOM_ALL = \
        ../../contrib/build/animate/makefile.wat \

+       ../../contrib/build/deprecated/makefile.wat \

        ../../contrib/build/fl/makefile.wat \
        ../../contrib/build/gizmos/makefile.wat \
        ../../contrib/build/fl/makefile.wat \
        ../../contrib/build/gizmos/makefile.wat \

+       ../../contrib/build/mmedia/makefile.wat \
+       ../../contrib/build/net/makefile.wat \

        ../../contrib/build/ogl/makefile.wat \
        ../../contrib/build/ogl/makefile.wat \

+       ../../contrib/build/plot/makefile.wat \

        ../../contrib/build/stc/makefile.wat \
        ../../contrib/build/svg/makefile.wat \
        ../../contrib/build/xrc/makefile.wat \
        ../../contrib/samples/animate/makefile.wat \
        ../../contrib/build/stc/makefile.wat \
        ../../contrib/build/svg/makefile.wat \
        ../../contrib/build/xrc/makefile.wat \
        ../../contrib/samples/animate/makefile.wat \

+       ../../contrib/samples/deprecated/proplist/makefile.wat \
+       ../../contrib/samples/deprecated/resource/makefile.wat \
+       ../../contrib/samples/deprecated/treelay/makefile.wat \
+       ../../contrib/samples/fl/makefile.wat \
+       ../../contrib/samples/gizmos/dynsash/makefile.wat \
+       ../../contrib/samples/gizmos/dynsash_switch/makefile.wat \
+       ../../contrib/samples/gizmos/editlbox/makefile.wat \
+       ../../contrib/samples/gizmos/led/makefile.wat \
+       ../../contrib/samples/gizmos/multicell/makefile.wat \
+       ../../contrib/samples/gizmos/splittree/makefile.wat \
+       ../../contrib/samples/mmedia/makefile.wat \
+       ../../contrib/samples/ogl/ogledit/makefile.wat \
+       ../../contrib/samples/ogl/studio/makefile.wat \
+       ../../contrib/samples/plot/makefile.wat \
+       ../../contrib/samples/stc/makefile.wat \

        ../../contrib/samples/svg/makefile.wat \
        ../../contrib/samples/xrc/makefile.wat \
        ../../contrib/utils/wxrc/makefile.wat \
        ../../contrib/samples/svg/makefile.wat \
        ../../contrib/samples/xrc/makefile.wat \
        ../../contrib/utils/wxrc/makefile.wat \

+       ../../demos/bombs/makefile.wat \
+       ../../demos/dbbrowse/makefile.wat \
+       ../../demos/forty/makefile.wat \
+       ../../demos/fractal/makefile.wat \
+       ../../demos/life/makefile.wat \
+       ../../demos/makefile.wat \
+       ../../demos/poem/makefile.wat \

        ../../samples/access/makefile.wat \
        ../../samples/artprov/makefile.wat \
        ../../samples/calendar/makefile.wat \
        ../../samples/access/makefile.wat \
        ../../samples/artprov/makefile.wat \
        ../../samples/calendar/makefile.wat \


@@ -550,18 +731,22 @@ WATCOM_ALL = \
        ../../samples/minifram/makefile.wat \
        ../../samples/minimal/makefile.wat \
        ../../samples/mobile/makefile.wat \
        ../../samples/minifram/makefile.wat \
        ../../samples/minimal/makefile.wat \
        ../../samples/mobile/makefile.wat \

+       ../../samples/mobile/styles/makefile.wat \
+       ../../samples/mobile/wxedit/makefile.wat \

        ../../samples/multimon/makefile.wat \
        ../../samples/nativdlg/makefile.wat \
        ../../samples/multimon/makefile.wat \
        ../../samples/nativdlg/makefile.wat \

-       ../../samples/newgrid/makefile.wat \

        ../../samples/notebook/makefile.wat \
        ../../samples/oleauto/makefile.wat \
        ../../samples/opengl/cube/makefile.wat \
        ../../samples/notebook/makefile.wat \
        ../../samples/oleauto/makefile.wat \
        ../../samples/opengl/cube/makefile.wat \

+       ../../samples/opengl/isosurf/makefile.wat \

        ../../samples/opengl/makefile.wat \
        ../../samples/opengl/makefile.wat \

+       ../../samples/opengl/penguin/makefile.wat \

        ../../samples/ownerdrw/makefile.wat \
        ../../samples/png/makefile.wat \
        ../../samples/printing/makefile.wat \
        ../../samples/propsize/makefile.wat \
        ../../samples/regtest/makefile.wat \
        ../../samples/ownerdrw/makefile.wat \
        ../../samples/png/makefile.wat \
        ../../samples/printing/makefile.wat \
        ../../samples/propsize/makefile.wat \
        ../../samples/regtest/makefile.wat \

+       ../../samples/render/makefile.wat \

        ../../samples/richedit/makefile.wat \
        ../../samples/rotate/makefile.wat \
        ../../samples/sashtest/makefile.wat \
        ../../samples/richedit/makefile.wat \
        ../../samples/rotate/makefile.wat \
        ../../samples/sashtest/makefile.wat \


@@ -583,8 +768,10 @@ WATCOM_ALL = \
        ../../samples/widgets/makefile.wat \
        ../../samples/wizard/makefile.wat \
        ../../samples/wxtest/makefile.wat \
        ../../samples/widgets/makefile.wat \
        ../../samples/wizard/makefile.wat \
        ../../samples/wxtest/makefile.wat \

-       ../makefile.wat
-all: autoconf borland mingw msvc msvc6prj watcom
+       ../../utils/HelpGen/makefile.wat \
+       ../msw/makefile.wat
+
+all: $(COMPAT_TARGETS) autoconf borland mingw msvc msvc6prj watcom

 
 autoconf: $(AUTOCONF_ALL)
 borland: $(BORLAND_ALL)
 
 autoconf: $(AUTOCONF_ALL)
 borland: $(BORLAND_ALL)


@@ -595,19 +782,45 @@ watcom: $(WATCOM_ALL)
 
 clean:
        rm -f ../../autoconf_inc.m4
 
 clean:
        rm -f ../../autoconf_inc.m4

+       rm -f $(COMPAT_TARGETS)

        rm -f ../../Makefile.in
        rm -f ../../contrib/samples/animate/Makefile.in
        rm -f ../../Makefile.in
        rm -f ../../contrib/samples/animate/Makefile.in

+       rm -f ../../contrib/samples/deprecated/proplist/Makefile.in
+       rm -f ../../contrib/samples/deprecated/resource/Makefile.in
+       rm -f ../../contrib/samples/deprecated/treelay/Makefile.in
+       rm -f ../../contrib/samples/fl/Makefile.in
+       rm -f ../../contrib/samples/gizmos/dynsash/Makefile.in
+       rm -f ../../contrib/samples/gizmos/dynsash_switch/Makefile.in
+       rm -f ../../contrib/samples/gizmos/editlbox/Makefile.in
+       rm -f ../../contrib/samples/gizmos/led/Makefile.in
+       rm -f ../../contrib/samples/gizmos/multicell/Makefile.in
+       rm -f ../../contrib/samples/gizmos/splittree/Makefile.in
+       rm -f ../../contrib/samples/mmedia/Makefile.in
+       rm -f ../../contrib/samples/ogl/ogledit/Makefile.in
+       rm -f ../../contrib/samples/ogl/studio/Makefile.in
+       rm -f ../../contrib/samples/plot/Makefile.in
+       rm -f ../../contrib/samples/stc/Makefile.in

        rm -f ../../contrib/samples/svg/Makefile.in
        rm -f ../../contrib/samples/xrc/Makefile.in
        rm -f ../../contrib/src/animate/Makefile.in
        rm -f ../../contrib/samples/svg/Makefile.in
        rm -f ../../contrib/samples/xrc/Makefile.in
        rm -f ../../contrib/src/animate/Makefile.in

+       rm -f ../../contrib/src/deprecated/Makefile.in

        rm -f ../../contrib/src/fl/Makefile.in
        rm -f ../../contrib/src/gizmos/Makefile.in
        rm -f ../../contrib/src/fl/Makefile.in
        rm -f ../../contrib/src/gizmos/Makefile.in

+       rm -f ../../contrib/src/mmedia/Makefile.in
+       rm -f ../../contrib/src/net/Makefile.in

        rm -f ../../contrib/src/ogl/Makefile.in
        rm -f ../../contrib/src/ogl/Makefile.in

+       rm -f ../../contrib/src/plot/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 ../../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 ../../demos/Makefile.in
+       rm -f ../../demos/bombs/Makefile.in
+       rm -f ../../demos/dbbrowse/Makefile.in
+       rm -f ../../demos/forty/Makefile.in
+       rm -f ../../demos/fractal/Makefile.in
+       rm -f ../../demos/life/Makefile.in
+       rm -f ../../demos/poem/Makefile.in

        rm -f ../../samples/access/Makefile.in
        rm -f ../../samples/artprov/Makefile.in
        rm -f ../../samples/calendar/Makefile.in
        rm -f ../../samples/access/Makefile.in
        rm -f ../../samples/artprov/Makefile.in
        rm -f ../../samples/calendar/Makefile.in


@@ -657,18 +870,22 @@ clean:
        rm -f ../../samples/minifram/Makefile.in
        rm -f ../../samples/minimal/Makefile.in
        rm -f ../../samples/mobile/Makefile.in
        rm -f ../../samples/minifram/Makefile.in
        rm -f ../../samples/minimal/Makefile.in
        rm -f ../../samples/mobile/Makefile.in

+       rm -f ../../samples/mobile/styles/Makefile.in
+       rm -f ../../samples/mobile/wxedit/Makefile.in

        rm -f ../../samples/multimon/Makefile.in
        rm -f ../../samples/nativdlg/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/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/opengl/isosurf/Makefile.in
+       rm -f ../../samples/opengl/penguin/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/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/render/Makefile.in

        rm -f ../../samples/richedit/Makefile.in
        rm -f ../../samples/rotate/Makefile.in
        rm -f ../../samples/sashtest/Makefile.in
        rm -f ../../samples/richedit/Makefile.in
        rm -f ../../samples/rotate/Makefile.in
        rm -f ../../samples/sashtest/Makefile.in


@@ -690,17 +907,44 @@ clean:
        rm -f ../../samples/widgets/Makefile.in
        rm -f ../../samples/wizard/Makefile.in
        rm -f ../../samples/wxtest/Makefile.in
        rm -f ../../samples/widgets/Makefile.in
        rm -f ../../samples/wizard/Makefile.in
        rm -f ../../samples/wxtest/Makefile.in

+       rm -f ../../utils/HelpGen/Makefile.in

        rm -f ../../contrib/build/animate/makefile.bcc
        rm -f ../../contrib/build/animate/makefile.bcc

+       rm -f ../../contrib/build/deprecated/makefile.bcc

        rm -f ../../contrib/build/fl/makefile.bcc
        rm -f ../../contrib/build/gizmos/makefile.bcc
        rm -f ../../contrib/build/fl/makefile.bcc
        rm -f ../../contrib/build/gizmos/makefile.bcc

+       rm -f ../../contrib/build/mmedia/makefile.bcc
+       rm -f ../../contrib/build/net/makefile.bcc

        rm -f ../../contrib/build/ogl/makefile.bcc
        rm -f ../../contrib/build/ogl/makefile.bcc

+       rm -f ../../contrib/build/plot/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/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/deprecated/proplist/makefile.bcc
+       rm -f ../../contrib/samples/deprecated/resource/makefile.bcc
+       rm -f ../../contrib/samples/deprecated/treelay/makefile.bcc
+       rm -f ../../contrib/samples/fl/makefile.bcc
+       rm -f ../../contrib/samples/gizmos/dynsash/makefile.bcc
+       rm -f ../../contrib/samples/gizmos/dynsash_switch/makefile.bcc
+       rm -f ../../contrib/samples/gizmos/editlbox/makefile.bcc
+       rm -f ../../contrib/samples/gizmos/led/makefile.bcc
+       rm -f ../../contrib/samples/gizmos/multicell/makefile.bcc
+       rm -f ../../contrib/samples/gizmos/splittree/makefile.bcc
+       rm -f ../../contrib/samples/mmedia/makefile.bcc
+       rm -f ../../contrib/samples/ogl/ogledit/makefile.bcc
+       rm -f ../../contrib/samples/ogl/studio/makefile.bcc
+       rm -f ../../contrib/samples/plot/makefile.bcc
+       rm -f ../../contrib/samples/stc/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 ../../contrib/samples/svg/makefile.bcc
        rm -f ../../contrib/samples/xrc/makefile.bcc
        rm -f ../../contrib/utils/wxrc/makefile.bcc

+       rm -f ../../demos/bombs/makefile.bcc
+       rm -f ../../demos/dbbrowse/makefile.bcc
+       rm -f ../../demos/forty/makefile.bcc
+       rm -f ../../demos/fractal/makefile.bcc
+       rm -f ../../demos/life/makefile.bcc
+       rm -f ../../demos/makefile.bcc
+       rm -f ../../demos/poem/makefile.bcc

        rm -f ../../samples/access/makefile.bcc
        rm -f ../../samples/artprov/makefile.bcc
        rm -f ../../samples/calendar/makefile.bcc
        rm -f ../../samples/access/makefile.bcc
        rm -f ../../samples/artprov/makefile.bcc
        rm -f ../../samples/calendar/makefile.bcc


@@ -751,18 +995,22 @@ clean:
        rm -f ../../samples/minifram/makefile.bcc
        rm -f ../../samples/minimal/makefile.bcc
        rm -f ../../samples/mobile/makefile.bcc
        rm -f ../../samples/minifram/makefile.bcc
        rm -f ../../samples/minimal/makefile.bcc
        rm -f ../../samples/mobile/makefile.bcc

+       rm -f ../../samples/mobile/styles/makefile.bcc
+       rm -f ../../samples/mobile/wxedit/makefile.bcc

        rm -f ../../samples/multimon/makefile.bcc
        rm -f ../../samples/nativdlg/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/notebook/makefile.bcc
        rm -f ../../samples/oleauto/makefile.bcc
        rm -f ../../samples/opengl/cube/makefile.bcc

+       rm -f ../../samples/opengl/isosurf/makefile.bcc

        rm -f ../../samples/opengl/makefile.bcc
        rm -f ../../samples/opengl/makefile.bcc

+       rm -f ../../samples/opengl/penguin/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/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/render/makefile.bcc

        rm -f ../../samples/richedit/makefile.bcc
        rm -f ../../samples/rotate/makefile.bcc
        rm -f ../../samples/sashtest/makefile.bcc
        rm -f ../../samples/richedit/makefile.bcc
        rm -f ../../samples/rotate/makefile.bcc
        rm -f ../../samples/sashtest/makefile.bcc


@@ -784,18 +1032,45 @@ clean:
        rm -f ../../samples/widgets/makefile.bcc
        rm -f ../../samples/wizard/makefile.bcc
        rm -f ../../samples/wxtest/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 ../../utils/HelpGen/makefile.bcc
+       rm -f ../msw/makefile.bcc

        rm -f ../../contrib/build/animate/makefile.gcc
        rm -f ../../contrib/build/animate/makefile.gcc

+       rm -f ../../contrib/build/deprecated/makefile.gcc

        rm -f ../../contrib/build/fl/makefile.gcc
        rm -f ../../contrib/build/gizmos/makefile.gcc
        rm -f ../../contrib/build/fl/makefile.gcc
        rm -f ../../contrib/build/gizmos/makefile.gcc

+       rm -f ../../contrib/build/mmedia/makefile.gcc
+       rm -f ../../contrib/build/net/makefile.gcc

        rm -f ../../contrib/build/ogl/makefile.gcc
        rm -f ../../contrib/build/ogl/makefile.gcc

+       rm -f ../../contrib/build/plot/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/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/deprecated/proplist/makefile.gcc
+       rm -f ../../contrib/samples/deprecated/resource/makefile.gcc
+       rm -f ../../contrib/samples/deprecated/treelay/makefile.gcc
+       rm -f ../../contrib/samples/fl/makefile.gcc
+       rm -f ../../contrib/samples/gizmos/dynsash/makefile.gcc
+       rm -f ../../contrib/samples/gizmos/dynsash_switch/makefile.gcc
+       rm -f ../../contrib/samples/gizmos/editlbox/makefile.gcc
+       rm -f ../../contrib/samples/gizmos/led/makefile.gcc
+       rm -f ../../contrib/samples/gizmos/multicell/makefile.gcc
+       rm -f ../../contrib/samples/gizmos/splittree/makefile.gcc
+       rm -f ../../contrib/samples/mmedia/makefile.gcc
+       rm -f ../../contrib/samples/ogl/ogledit/makefile.gcc
+       rm -f ../../contrib/samples/ogl/studio/makefile.gcc
+       rm -f ../../contrib/samples/plot/makefile.gcc
+       rm -f ../../contrib/samples/stc/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 ../../contrib/samples/svg/makefile.gcc
        rm -f ../../contrib/samples/xrc/makefile.gcc
        rm -f ../../contrib/utils/wxrc/makefile.gcc

+       rm -f ../../demos/bombs/makefile.gcc
+       rm -f ../../demos/dbbrowse/makefile.gcc
+       rm -f ../../demos/forty/makefile.gcc
+       rm -f ../../demos/fractal/makefile.gcc
+       rm -f ../../demos/life/makefile.gcc
+       rm -f ../../demos/makefile.gcc
+       rm -f ../../demos/poem/makefile.gcc

        rm -f ../../samples/access/makefile.gcc
        rm -f ../../samples/artprov/makefile.gcc
        rm -f ../../samples/calendar/makefile.gcc
        rm -f ../../samples/access/makefile.gcc
        rm -f ../../samples/artprov/makefile.gcc
        rm -f ../../samples/calendar/makefile.gcc


@@ -846,18 +1121,22 @@ clean:
        rm -f ../../samples/minifram/makefile.gcc
        rm -f ../../samples/minimal/makefile.gcc
        rm -f ../../samples/mobile/makefile.gcc
        rm -f ../../samples/minifram/makefile.gcc
        rm -f ../../samples/minimal/makefile.gcc
        rm -f ../../samples/mobile/makefile.gcc

+       rm -f ../../samples/mobile/styles/makefile.gcc
+       rm -f ../../samples/mobile/wxedit/makefile.gcc

        rm -f ../../samples/multimon/makefile.gcc
        rm -f ../../samples/nativdlg/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/notebook/makefile.gcc
        rm -f ../../samples/oleauto/makefile.gcc
        rm -f ../../samples/opengl/cube/makefile.gcc

+       rm -f ../../samples/opengl/isosurf/makefile.gcc

        rm -f ../../samples/opengl/makefile.gcc
        rm -f ../../samples/opengl/makefile.gcc

+       rm -f ../../samples/opengl/penguin/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/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/render/makefile.gcc

        rm -f ../../samples/richedit/makefile.gcc
        rm -f ../../samples/rotate/makefile.gcc
        rm -f ../../samples/sashtest/makefile.gcc
        rm -f ../../samples/richedit/makefile.gcc
        rm -f ../../samples/rotate/makefile.gcc
        rm -f ../../samples/sashtest/makefile.gcc


@@ -879,18 +1158,45 @@ clean:
        rm -f ../../samples/widgets/makefile.gcc
        rm -f ../../samples/wizard/makefile.gcc
        rm -f ../../samples/wxtest/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 ../../utils/HelpGen/makefile.gcc
+       rm -f ../msw/makefile.gcc

        rm -f ../../contrib/build/animate/makefile.vc
        rm -f ../../contrib/build/animate/makefile.vc

+       rm -f ../../contrib/build/deprecated/makefile.vc

        rm -f ../../contrib/build/fl/makefile.vc
        rm -f ../../contrib/build/gizmos/makefile.vc
        rm -f ../../contrib/build/fl/makefile.vc
        rm -f ../../contrib/build/gizmos/makefile.vc

+       rm -f ../../contrib/build/mmedia/makefile.vc
+       rm -f ../../contrib/build/net/makefile.vc

        rm -f ../../contrib/build/ogl/makefile.vc
        rm -f ../../contrib/build/ogl/makefile.vc

+       rm -f ../../contrib/build/plot/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/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/deprecated/proplist/makefile.vc
+       rm -f ../../contrib/samples/deprecated/resource/makefile.vc
+       rm -f ../../contrib/samples/deprecated/treelay/makefile.vc
+       rm -f ../../contrib/samples/fl/makefile.vc
+       rm -f ../../contrib/samples/gizmos/dynsash/makefile.vc
+       rm -f ../../contrib/samples/gizmos/dynsash_switch/makefile.vc
+       rm -f ../../contrib/samples/gizmos/editlbox/makefile.vc
+       rm -f ../../contrib/samples/gizmos/led/makefile.vc
+       rm -f ../../contrib/samples/gizmos/multicell/makefile.vc
+       rm -f ../../contrib/samples/gizmos/splittree/makefile.vc
+       rm -f ../../contrib/samples/mmedia/makefile.vc
+       rm -f ../../contrib/samples/ogl/ogledit/makefile.vc
+       rm -f ../../contrib/samples/ogl/studio/makefile.vc
+       rm -f ../../contrib/samples/plot/makefile.vc
+       rm -f ../../contrib/samples/stc/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 ../../contrib/samples/svg/makefile.vc
        rm -f ../../contrib/samples/xrc/makefile.vc
        rm -f ../../contrib/utils/wxrc/makefile.vc

+       rm -f ../../demos/bombs/makefile.vc
+       rm -f ../../demos/dbbrowse/makefile.vc
+       rm -f ../../demos/forty/makefile.vc
+       rm -f ../../demos/fractal/makefile.vc
+       rm -f ../../demos/life/makefile.vc
+       rm -f ../../demos/makefile.vc
+       rm -f ../../demos/poem/makefile.vc

        rm -f ../../samples/access/makefile.vc
        rm -f ../../samples/artprov/makefile.vc
        rm -f ../../samples/calendar/makefile.vc
        rm -f ../../samples/access/makefile.vc
        rm -f ../../samples/artprov/makefile.vc
        rm -f ../../samples/calendar/makefile.vc


@@ -941,18 +1247,22 @@ clean:
        rm -f ../../samples/minifram/makefile.vc
        rm -f ../../samples/minimal/makefile.vc
        rm -f ../../samples/mobile/makefile.vc
        rm -f ../../samples/minifram/makefile.vc
        rm -f ../../samples/minimal/makefile.vc
        rm -f ../../samples/mobile/makefile.vc

+       rm -f ../../samples/mobile/styles/makefile.vc
+       rm -f ../../samples/mobile/wxedit/makefile.vc

        rm -f ../../samples/multimon/makefile.vc
        rm -f ../../samples/nativdlg/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/notebook/makefile.vc
        rm -f ../../samples/oleauto/makefile.vc
        rm -f ../../samples/opengl/cube/makefile.vc

+       rm -f ../../samples/opengl/isosurf/makefile.vc

        rm -f ../../samples/opengl/makefile.vc
        rm -f ../../samples/opengl/makefile.vc

+       rm -f ../../samples/opengl/penguin/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/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/render/makefile.vc

        rm -f ../../samples/richedit/makefile.vc
        rm -f ../../samples/rotate/makefile.vc
        rm -f ../../samples/sashtest/makefile.vc
        rm -f ../../samples/richedit/makefile.vc
        rm -f ../../samples/rotate/makefile.vc
        rm -f ../../samples/sashtest/makefile.vc


@@ -974,18 +1284,44 @@ clean:
        rm -f ../../samples/widgets/makefile.vc
        rm -f ../../samples/wizard/makefile.vc
        rm -f ../../samples/wxtest/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 ../../utils/HelpGen/makefile.vc
+       rm -f ../msw/makefile.vc

        rm -f ../../contrib/build/animate/animate.dsw
        rm -f ../../contrib/build/animate/animate.dsw

+       rm -f ../../contrib/build/deprecated/deprecated.dsw

        rm -f ../../contrib/build/fl/fl.dsw
        rm -f ../../contrib/build/gizmos/gizmos.dsw
        rm -f ../../contrib/build/fl/fl.dsw
        rm -f ../../contrib/build/gizmos/gizmos.dsw

+       rm -f ../../contrib/build/mmedia/mmedia.dsw
+       rm -f ../../contrib/build/net/netutils.dsw

        rm -f ../../contrib/build/ogl/ogl.dsw
        rm -f ../../contrib/build/ogl/ogl.dsw

+       rm -f ../../contrib/build/plot/plot.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/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/deprecated/proplist/proplist.dsw
+       rm -f ../../contrib/samples/deprecated/resource/resource.dsw
+       rm -f ../../contrib/samples/deprecated/treelay/treelay.dsw
+       rm -f ../../contrib/samples/fl/fl.dsw
+       rm -f ../../contrib/samples/gizmos/dynsash/dynsash.dsw
+       rm -f ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw
+       rm -f ../../contrib/samples/gizmos/editlbox/editlbox.dsw
+       rm -f ../../contrib/samples/gizmos/led/led.dsw
+       rm -f ../../contrib/samples/gizmos/multicell/multicell.dsw
+       rm -f ../../contrib/samples/gizmos/splittree/splittree.dsw
+       rm -f ../../contrib/samples/mmedia/mmboard.dsw
+       rm -f ../../contrib/samples/ogl/ogledit/ogledit.dsw
+       rm -f ../../contrib/samples/ogl/studio/studio.dsw
+       rm -f ../../contrib/samples/plot/plot.dsw
+       rm -f ../../contrib/samples/stc/stctest.dsw

        rm -f ../../contrib/samples/svg/svgtest.dsw
        rm -f ../../contrib/samples/xrc/xrcdemo.dsw
        rm -f ../../contrib/utils/wxrc/wxrc.dsw
        rm -f ../../contrib/samples/svg/svgtest.dsw
        rm -f ../../contrib/samples/xrc/xrcdemo.dsw
        rm -f ../../contrib/utils/wxrc/wxrc.dsw

+       rm -f ../../demos/bombs/bombs.dsw
+       rm -f ../../demos/dbbrowse/dbbrowse.dsw
+       rm -f ../../demos/forty/forty.dsw
+       rm -f ../../demos/fractal/fractal.dsw
+       rm -f ../../demos/life/life.dsw
+       rm -f ../../demos/poem/poem.dsw

        rm -f ../../samples/access/access.dsw
        rm -f ../../samples/artprov/artprov.dsw
        rm -f ../../samples/calendar/calendar.dsw
        rm -f ../../samples/access/access.dsw
        rm -f ../../samples/artprov/artprov.dsw
        rm -f ../../samples/calendar/calendar.dsw


@@ -1033,18 +1369,21 @@ clean:
        rm -f ../../samples/mfc/mfc.dsw
        rm -f ../../samples/minifram/minifram.dsw
        rm -f ../../samples/minimal/minimal.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/mobile/styles/styles.dsw
+       rm -f ../../samples/mobile/wxedit/wxedit.dsw

        rm -f ../../samples/multimon/multimon.dsw
        rm -f ../../samples/nativdlg/nativdlg.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/notebook/notebook.dsw
        rm -f ../../samples/oleauto/oleauto.dsw
        rm -f ../../samples/opengl/cube/cube.dsw

+       rm -f ../../samples/opengl/isosurf/isosurf.dsw
+       rm -f ../../samples/opengl/penguin/penguin.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/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/render/render.dsw

        rm -f ../../samples/richedit/richedit.dsw
        rm -f ../../samples/rotate/rotate.dsw
        rm -f ../../samples/sashtest/sashtest.dsw
        rm -f ../../samples/richedit/richedit.dsw
        rm -f ../../samples/rotate/rotate.dsw
        rm -f ../../samples/sashtest/sashtest.dsw


@@ -1066,18 +1405,45 @@ clean:
        rm -f ../../samples/widgets/widgets.dsw
        rm -f ../../samples/wizard/wizard.dsw
        rm -f ../../samples/wxtest/wxtest.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 ../../utils/HelpGen/helpgen.dsw
+       rm -f ../msw/wx.dsw

        rm -f ../../contrib/build/animate/makefile.wat
        rm -f ../../contrib/build/animate/makefile.wat

+       rm -f ../../contrib/build/deprecated/makefile.wat

        rm -f ../../contrib/build/fl/makefile.wat
        rm -f ../../contrib/build/gizmos/makefile.wat
        rm -f ../../contrib/build/fl/makefile.wat
        rm -f ../../contrib/build/gizmos/makefile.wat

+       rm -f ../../contrib/build/mmedia/makefile.wat
+       rm -f ../../contrib/build/net/makefile.wat

        rm -f ../../contrib/build/ogl/makefile.wat
        rm -f ../../contrib/build/ogl/makefile.wat

+       rm -f ../../contrib/build/plot/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/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/deprecated/proplist/makefile.wat
+       rm -f ../../contrib/samples/deprecated/resource/makefile.wat
+       rm -f ../../contrib/samples/deprecated/treelay/makefile.wat
+       rm -f ../../contrib/samples/fl/makefile.wat
+       rm -f ../../contrib/samples/gizmos/dynsash/makefile.wat
+       rm -f ../../contrib/samples/gizmos/dynsash_switch/makefile.wat
+       rm -f ../../contrib/samples/gizmos/editlbox/makefile.wat
+       rm -f ../../contrib/samples/gizmos/led/makefile.wat
+       rm -f ../../contrib/samples/gizmos/multicell/makefile.wat
+       rm -f ../../contrib/samples/gizmos/splittree/makefile.wat
+       rm -f ../../contrib/samples/mmedia/makefile.wat
+       rm -f ../../contrib/samples/ogl/ogledit/makefile.wat
+       rm -f ../../contrib/samples/ogl/studio/makefile.wat
+       rm -f ../../contrib/samples/plot/makefile.wat
+       rm -f ../../contrib/samples/stc/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 ../../contrib/samples/svg/makefile.wat
        rm -f ../../contrib/samples/xrc/makefile.wat
        rm -f ../../contrib/utils/wxrc/makefile.wat

+       rm -f ../../demos/bombs/makefile.wat
+       rm -f ../../demos/dbbrowse/makefile.wat
+       rm -f ../../demos/forty/makefile.wat
+       rm -f ../../demos/fractal/makefile.wat
+       rm -f ../../demos/life/makefile.wat
+       rm -f ../../demos/makefile.wat
+       rm -f ../../demos/poem/makefile.wat

        rm -f ../../samples/access/makefile.wat
        rm -f ../../samples/artprov/makefile.wat
        rm -f ../../samples/calendar/makefile.wat
        rm -f ../../samples/access/makefile.wat
        rm -f ../../samples/artprov/makefile.wat
        rm -f ../../samples/calendar/makefile.wat


@@ -1128,18 +1494,22 @@ clean:
        rm -f ../../samples/minifram/makefile.wat
        rm -f ../../samples/minimal/makefile.wat
        rm -f ../../samples/mobile/makefile.wat
        rm -f ../../samples/minifram/makefile.wat
        rm -f ../../samples/minimal/makefile.wat
        rm -f ../../samples/mobile/makefile.wat

+       rm -f ../../samples/mobile/styles/makefile.wat
+       rm -f ../../samples/mobile/wxedit/makefile.wat

        rm -f ../../samples/multimon/makefile.wat
        rm -f ../../samples/nativdlg/makefile.wat
        rm -f ../../samples/multimon/makefile.wat
        rm -f ../../samples/nativdlg/makefile.wat

-       rm -f ../../samples/newgrid/makefile.wat

        rm -f ../../samples/notebook/makefile.wat
        rm -f ../../samples/oleauto/makefile.wat
        rm -f ../../samples/opengl/cube/makefile.wat
        rm -f ../../samples/notebook/makefile.wat
        rm -f ../../samples/oleauto/makefile.wat
        rm -f ../../samples/opengl/cube/makefile.wat

+       rm -f ../../samples/opengl/isosurf/makefile.wat

        rm -f ../../samples/opengl/makefile.wat
        rm -f ../../samples/opengl/makefile.wat

+       rm -f ../../samples/opengl/penguin/makefile.wat

        rm -f ../../samples/ownerdrw/makefile.wat
        rm -f ../../samples/png/makefile.wat
        rm -f ../../samples/printing/makefile.wat
        rm -f ../../samples/propsize/makefile.wat
        rm -f ../../samples/regtest/makefile.wat
        rm -f ../../samples/ownerdrw/makefile.wat
        rm -f ../../samples/png/makefile.wat
        rm -f ../../samples/printing/makefile.wat
        rm -f ../../samples/propsize/makefile.wat
        rm -f ../../samples/regtest/makefile.wat

+       rm -f ../../samples/render/makefile.wat

        rm -f ../../samples/richedit/makefile.wat
        rm -f ../../samples/rotate/makefile.wat
        rm -f ../../samples/sashtest/makefile.wat
        rm -f ../../samples/richedit/makefile.wat
        rm -f ../../samples/rotate/makefile.wat
        rm -f ../../samples/sashtest/makefile.wat


@@ -1161,13 +1531,24 @@ clean:
        rm -f ../../samples/widgets/makefile.wat
        rm -f ../../samples/wizard/makefile.wat
        rm -f ../../samples/wxtest/makefile.wat
        rm -f ../../samples/widgets/makefile.wat
        rm -f ../../samples/wizard/makefile.wat
        rm -f ../../samples/wxtest/makefile.wat

-       rm -f ../makefile.wat
+       rm -f ../../utils/HelpGen/makefile.wat
+       rm -f ../msw/makefile.wat

 
 
 
 

-library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc
+library: ../../Makefile.in\
+         ../msw/makefile.bcc\
+         ../msw/makefile.vc\
+         ../msw/makefile.wat\
+         ../msw/makefile.gcc\
+         ../msw/wx.dsw\
+         ../../src/wxWindows.dsp

 
 ../../autoconf_inc.m4: ../../Makefile.in
 
 
 ../../autoconf_inc.m4: ../../Makefile.in
 

+../../src/wxWindows.dsp: monolithic.bkl files.bkl
+       $(BAKEFILE) -Icompat -fwx24dsp -DUSE_GUI=1 -DWXUNIV=0 -o$@ wx.bkl
+       touch $@
+

 Makefile: regenMakefile.py
        ./regenMakefile.py
        @echo
 Makefile: regenMakefile.py
        ./regenMakefile.py
        @echo


@@ -1179,1891 +1560,2502 @@ Makefile: regenMakefile.py
 
 
 ../../contrib/src/animate/Makefile.in: $(CDEPS) ../../contrib/build/animate/animate.bkl
 
 
 ../../contrib/src/animate/Makefile.in: $(CDEPS) ../../contrib/build/animate/animate.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/animate/animate.bkl
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/animate/animate.bkl

        touch $@
 ../../contrib/build/animate/makefile.bcc: $(CDEPS) ../../contrib/build/animate/animate.bkl
        touch $@
 ../../contrib/build/animate/makefile.bcc: $(CDEPS) ../../contrib/build/animate/animate.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/animate -DWXTOPDIR=../../../ ../../contrib/build/animate/animate.bkl
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/animate ../../contrib/build/animate/animate.bkl

        touch $@
 ../../contrib/build/animate/makefile.vc: $(CDEPS) ../../contrib/build/animate/animate.bkl
        touch $@
 ../../contrib/build/animate/makefile.vc: $(CDEPS) ../../contrib/build/animate/animate.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/animate -DWXTOPDIR=../../../ ../../contrib/build/animate/animate.bkl
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/animate ../../contrib/build/animate/animate.bkl

        touch $@
 ../../contrib/build/animate/makefile.gcc: $(CDEPS) ../../contrib/build/animate/animate.bkl
        touch $@
 ../../contrib/build/animate/makefile.gcc: $(CDEPS) ../../contrib/build/animate/animate.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/animate -DWXTOPDIR=../../../ ../../contrib/build/animate/animate.bkl
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/animate ../../contrib/build/animate/animate.bkl

        touch $@
 ../../contrib/build/animate/makefile.wat: $(CDEPS) ../../contrib/build/animate/animate.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/animate ../../contrib/build/animate/animate.bkl

        touch $@
 ../../contrib/build/animate/animate.dsw: $(CDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/animate ../../contrib/build/animate/animate.bkl
+       touch $@
+
+
+../../contrib/src/deprecated/Makefile.in: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/deprecated/deprecated.bkl
+       touch $@
+../../contrib/build/deprecated/makefile.bcc: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/deprecated ../../contrib/build/deprecated/deprecated.bkl
+       touch $@
+../../contrib/build/deprecated/makefile.vc: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/deprecated ../../contrib/build/deprecated/deprecated.bkl
+       touch $@
+../../contrib/build/deprecated/makefile.gcc: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/deprecated ../../contrib/build/deprecated/deprecated.bkl
+       touch $@
+../../contrib/build/deprecated/makefile.wat: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/deprecated ../../contrib/build/deprecated/deprecated.bkl
+       touch $@
+../../contrib/build/deprecated/deprecated.dsw: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/deprecated ../../contrib/build/deprecated/deprecated.bkl

        touch $@
 
 
 ../../contrib/src/fl/Makefile.in: $(CDEPS) ../../contrib/build/fl/fl.bkl
        touch $@
 
 
 ../../contrib/src/fl/Makefile.in: $(CDEPS) ../../contrib/build/fl/fl.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/fl/fl.bkl
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/fl/fl.bkl

        touch $@
 ../../contrib/build/fl/makefile.bcc: $(CDEPS) ../../contrib/build/fl/fl.bkl
        touch $@
 ../../contrib/build/fl/makefile.bcc: $(CDEPS) ../../contrib/build/fl/fl.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/fl ../../contrib/build/fl/fl.bkl

        touch $@
 ../../contrib/build/fl/makefile.vc: $(CDEPS) ../../contrib/build/fl/fl.bkl
        touch $@
 ../../contrib/build/fl/makefile.vc: $(CDEPS) ../../contrib/build/fl/fl.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/fl ../../contrib/build/fl/fl.bkl

        touch $@
 ../../contrib/build/fl/makefile.gcc: $(CDEPS) ../../contrib/build/fl/fl.bkl
        touch $@
 ../../contrib/build/fl/makefile.gcc: $(CDEPS) ../../contrib/build/fl/fl.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/fl -DWXTOPDIR=../../../ ../../contrib/build/fl/fl.bkl
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/fl ../../contrib/build/fl/fl.bkl

        touch $@
 ../../contrib/build/fl/makefile.wat: $(CDEPS) ../../contrib/build/fl/fl.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/fl ../../contrib/build/fl/fl.bkl

        touch $@
 ../../contrib/build/fl/fl.dsw: $(CDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/fl ../../contrib/build/fl/fl.bkl

        touch $@
 
 
 ../../contrib/src/gizmos/Makefile.in: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl
        touch $@
 
 
 ../../contrib/src/gizmos/Makefile.in: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/gizmos/gizmos.bkl
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/gizmos/gizmos.bkl

        touch $@
 ../../contrib/build/gizmos/makefile.bcc: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl
        touch $@
 ../../contrib/build/gizmos/makefile.bcc: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/gizmos -DWXTOPDIR=../../../ ../../contrib/build/gizmos/gizmos.bkl
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/gizmos ../../contrib/build/gizmos/gizmos.bkl

        touch $@
 ../../contrib/build/gizmos/makefile.vc: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl
        touch $@
 ../../contrib/build/gizmos/makefile.vc: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/gizmos -DWXTOPDIR=../../../ ../../contrib/build/gizmos/gizmos.bkl
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/gizmos ../../contrib/build/gizmos/gizmos.bkl

        touch $@
 ../../contrib/build/gizmos/makefile.gcc: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl
        touch $@
 ../../contrib/build/gizmos/makefile.gcc: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/gizmos -DWXTOPDIR=../../../ ../../contrib/build/gizmos/gizmos.bkl
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/gizmos ../../contrib/build/gizmos/gizmos.bkl

        touch $@
 ../../contrib/build/gizmos/makefile.wat: $(CDEPS) ../../contrib/build/gizmos/gizmos.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/gizmos ../../contrib/build/gizmos/gizmos.bkl

        touch $@
 ../../contrib/build/gizmos/gizmos.dsw: $(CDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/gizmos ../../contrib/build/gizmos/gizmos.bkl
+       touch $@
+
+
+../../contrib/src/mmedia/Makefile.in: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/mmedia/mmedia.bkl
+       touch $@
+../../contrib/build/mmedia/makefile.bcc: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/mmedia ../../contrib/build/mmedia/mmedia.bkl
+       touch $@
+../../contrib/build/mmedia/makefile.vc: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/mmedia ../../contrib/build/mmedia/mmedia.bkl
+       touch $@
+../../contrib/build/mmedia/makefile.gcc: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/mmedia ../../contrib/build/mmedia/mmedia.bkl
+       touch $@
+../../contrib/build/mmedia/makefile.wat: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/mmedia ../../contrib/build/mmedia/mmedia.bkl
+       touch $@
+../../contrib/build/mmedia/mmedia.dsw: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/mmedia ../../contrib/build/mmedia/mmedia.bkl
+       touch $@
+
+
+../../contrib/src/net/Makefile.in: $(CDEPS) ../../contrib/build/net/netutils.bkl
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/net/netutils.bkl
+       touch $@
+../../contrib/build/net/makefile.bcc: $(CDEPS) ../../contrib/build/net/netutils.bkl
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/net ../../contrib/build/net/netutils.bkl
+       touch $@
+../../contrib/build/net/makefile.vc: $(CDEPS) ../../contrib/build/net/netutils.bkl
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/net ../../contrib/build/net/netutils.bkl
+       touch $@
+../../contrib/build/net/makefile.gcc: $(CDEPS) ../../contrib/build/net/netutils.bkl
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/net ../../contrib/build/net/netutils.bkl
+       touch $@
+../../contrib/build/net/makefile.wat: $(CDEPS) ../../contrib/build/net/netutils.bkl
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/net ../../contrib/build/net/netutils.bkl
+       touch $@
+../../contrib/build/net/netutils.dsw: $(CDEPS) ../../contrib/build/net/netutils.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/net ../../contrib/build/net/netutils.bkl

        touch $@
 
 
 ../../contrib/src/ogl/Makefile.in: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
        touch $@
 
 
 ../../contrib/src/ogl/Makefile.in: $(CDEPS) ../../contrib/build/ogl/ogl.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/ogl/ogl.bkl
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/ogl/ogl.bkl

        touch $@
 ../../contrib/build/ogl/makefile.bcc: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
        touch $@
 ../../contrib/build/ogl/makefile.bcc: $(CDEPS) ../../contrib/build/ogl/ogl.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/ogl -DWXTOPDIR=../../../ ../../contrib/build/ogl/ogl.bkl
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/ogl ../../contrib/build/ogl/ogl.bkl

        touch $@
 ../../contrib/build/ogl/makefile.vc: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
        touch $@
 ../../contrib/build/ogl/makefile.vc: $(CDEPS) ../../contrib/build/ogl/ogl.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/ogl -DWXTOPDIR=../../../ ../../contrib/build/ogl/ogl.bkl
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/ogl ../../contrib/build/ogl/ogl.bkl

        touch $@
 ../../contrib/build/ogl/makefile.gcc: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
        touch $@
 ../../contrib/build/ogl/makefile.gcc: $(CDEPS) ../../contrib/build/ogl/ogl.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/ogl -DWXTOPDIR=../../../ ../../contrib/build/ogl/ogl.bkl
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/ogl ../../contrib/build/ogl/ogl.bkl

        touch $@
 ../../contrib/build/ogl/makefile.wat: $(CDEPS) ../../contrib/build/ogl/ogl.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/ogl ../../contrib/build/ogl/ogl.bkl

        touch $@
 ../../contrib/build/ogl/ogl.dsw: $(CDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/ogl ../../contrib/build/ogl/ogl.bkl
+       touch $@
+
+
+../../contrib/src/plot/Makefile.in: $(CDEPS) ../../contrib/build/plot/plot.bkl
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/plot/plot.bkl
+       touch $@
+../../contrib/build/plot/makefile.bcc: $(CDEPS) ../../contrib/build/plot/plot.bkl
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/plot ../../contrib/build/plot/plot.bkl
+       touch $@
+../../contrib/build/plot/makefile.vc: $(CDEPS) ../../contrib/build/plot/plot.bkl
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/plot ../../contrib/build/plot/plot.bkl
+       touch $@
+../../contrib/build/plot/makefile.gcc: $(CDEPS) ../../contrib/build/plot/plot.bkl
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/plot ../../contrib/build/plot/plot.bkl
+       touch $@
+../../contrib/build/plot/makefile.wat: $(CDEPS) ../../contrib/build/plot/plot.bkl
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/plot ../../contrib/build/plot/plot.bkl
+       touch $@
+../../contrib/build/plot/plot.dsw: $(CDEPS) ../../contrib/build/plot/plot.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/plot ../../contrib/build/plot/plot.bkl

        touch $@
 
 
 ../../contrib/src/stc/Makefile.in: $(CDEPS) ../../contrib/build/stc/stc.bkl
        touch $@
 
 
 ../../contrib/src/stc/Makefile.in: $(CDEPS) ../../contrib/build/stc/stc.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/stc/stc.bkl
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/stc/stc.bkl

        touch $@
 ../../contrib/build/stc/makefile.bcc: $(CDEPS) ../../contrib/build/stc/stc.bkl
        touch $@
 ../../contrib/build/stc/makefile.bcc: $(CDEPS) ../../contrib/build/stc/stc.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/stc ../../contrib/build/stc/stc.bkl

        touch $@
 ../../contrib/build/stc/makefile.vc: $(CDEPS) ../../contrib/build/stc/stc.bkl
        touch $@
 ../../contrib/build/stc/makefile.vc: $(CDEPS) ../../contrib/build/stc/stc.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/stc ../../contrib/build/stc/stc.bkl

        touch $@
 ../../contrib/build/stc/makefile.gcc: $(CDEPS) ../../contrib/build/stc/stc.bkl
        touch $@
 ../../contrib/build/stc/makefile.gcc: $(CDEPS) ../../contrib/build/stc/stc.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/stc -DWXTOPDIR=../../../ ../../contrib/build/stc/stc.bkl
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/stc ../../contrib/build/stc/stc.bkl

        touch $@
 ../../contrib/build/stc/makefile.wat: $(CDEPS) ../../contrib/build/stc/stc.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/stc ../../contrib/build/stc/stc.bkl

        touch $@
 ../../contrib/build/stc/stc.dsw: $(CDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/stc ../../contrib/build/stc/stc.bkl

        touch $@
 
 
 ../../contrib/src/svg/Makefile.in: $(CDEPS) ../../contrib/build/svg/svg.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
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/svg/svg.bkl

        touch $@
 ../../contrib/build/svg/makefile.bcc: $(CDEPS) ../../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
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg ../../contrib/build/svg/svg.bkl

        touch $@
 ../../contrib/build/svg/makefile.vc: $(CDEPS) ../../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
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg ../../contrib/build/svg/svg.bkl

        touch $@
 ../../contrib/build/svg/makefile.gcc: $(CDEPS) ../../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
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg ../../contrib/build/svg/svg.bkl

        touch $@
 ../../contrib/build/svg/makefile.wat: $(CDEPS) ../../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
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg ../../contrib/build/svg/svg.bkl

        touch $@
 ../../contrib/build/svg/svg.dsw: $(CDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/svg ../../contrib/build/svg/svg.bkl

        touch $@
 
 
 ../../contrib/src/xrc/Makefile.in: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
        touch $@
 
 
 ../../contrib/src/xrc/Makefile.in: $(CDEPS) ../../contrib/build/xrc/xrc.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/xrc/xrc.bkl
+       $(BAKEFILE) -fautoconf -o$@   -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/xrc/xrc.bkl

        touch $@
 ../../contrib/build/xrc/makefile.bcc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
        touch $@
 ../../contrib/build/xrc/makefile.bcc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
+       $(BAKEFILE) -fborland -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/xrc ../../contrib/build/xrc/xrc.bkl

        touch $@
 ../../contrib/build/xrc/makefile.vc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
        touch $@
 ../../contrib/build/xrc/makefile.vc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
+       $(BAKEFILE) -fmsvc -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/xrc ../../contrib/build/xrc/xrc.bkl

        touch $@
 ../../contrib/build/xrc/makefile.gcc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
        touch $@
 ../../contrib/build/xrc/makefile.gcc: $(CDEPS) ../../contrib/build/xrc/xrc.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/xrc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
+       $(BAKEFILE) -fmingw -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/xrc ../../contrib/build/xrc/xrc.bkl

        touch $@
 ../../contrib/build/xrc/makefile.wat: $(CDEPS) ../../contrib/build/xrc/xrc.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@   -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/xrc ../../contrib/build/xrc/xrc.bkl

        touch $@
 ../../contrib/build/xrc/xrc.dsw: $(CDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@   -DWXTOPDIR=../../../ $(DSWFLAGS) -DSRCDIR=../../src/xrc ../../contrib/build/xrc/xrc.bkl

        touch $@
 
 
 ../../contrib/samples/animate/Makefile.in: $(SDEPS) ../../contrib/samples/animate/anitest.bkl
        touch $@
 
 
 ../../contrib/samples/animate/Makefile.in: $(SDEPS) ../../contrib/samples/animate/anitest.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/animate/anitest.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/animate/anitest.bkl

        touch $@
 ../../contrib/samples/animate/makefile.bcc: $(SDEPS) ../../contrib/samples/animate/anitest.bkl
        touch $@
 ../../contrib/samples/animate/makefile.bcc: $(SDEPS) ../../contrib/samples/animate/anitest.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/animate/anitest.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/animate/anitest.bkl

        touch $@
 ../../contrib/samples/animate/makefile.vc: $(SDEPS) ../../contrib/samples/animate/anitest.bkl
        touch $@
 ../../contrib/samples/animate/makefile.vc: $(SDEPS) ../../contrib/samples/animate/anitest.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/animate/anitest.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/animate/anitest.bkl

        touch $@
 ../../contrib/samples/animate/makefile.gcc: $(SDEPS) ../../contrib/samples/animate/anitest.bkl
        touch $@
 ../../contrib/samples/animate/makefile.gcc: $(SDEPS) ../../contrib/samples/animate/anitest.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/animate/anitest.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/animate/anitest.bkl

        touch $@
 ../../contrib/samples/animate/makefile.wat: $(SDEPS) ../../contrib/samples/animate/anitest.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/animate/anitest.bkl

        touch $@
 ../../contrib/samples/animate/anitest.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../contrib/samples/animate/anitest.bkl
+       touch $@
+
+
+../../contrib/samples/deprecated/proplist/Makefile.in: $(SDEPS) ../../contrib/samples/deprecated/proplist/proplist.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/deprecated/proplist/proplist.bkl
+       touch $@
+../../contrib/samples/deprecated/proplist/makefile.bcc: $(SDEPS) ../../contrib/samples/deprecated/proplist/proplist.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/proplist/proplist.bkl
+       touch $@
+../../contrib/samples/deprecated/proplist/makefile.vc: $(SDEPS) ../../contrib/samples/deprecated/proplist/proplist.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/proplist/proplist.bkl
+       touch $@
+../../contrib/samples/deprecated/proplist/makefile.gcc: $(SDEPS) ../../contrib/samples/deprecated/proplist/proplist.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/proplist/proplist.bkl
+       touch $@
+../../contrib/samples/deprecated/proplist/makefile.wat: $(SDEPS) ../../contrib/samples/deprecated/proplist/proplist.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/proplist/proplist.bkl
+       touch $@
+../../contrib/samples/deprecated/proplist/proplist.dsw: $(SDEPS) ../../contrib/samples/deprecated/proplist/proplist.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/deprecated/proplist/proplist.bkl
+       touch $@
+
+
+../../contrib/samples/deprecated/resource/Makefile.in: $(SDEPS) ../../contrib/samples/deprecated/resource/resource.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/deprecated/resource/resource.bkl
+       touch $@
+../../contrib/samples/deprecated/resource/makefile.bcc: $(SDEPS) ../../contrib/samples/deprecated/resource/resource.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/resource/resource.bkl
+       touch $@
+../../contrib/samples/deprecated/resource/makefile.vc: $(SDEPS) ../../contrib/samples/deprecated/resource/resource.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/resource/resource.bkl
+       touch $@
+../../contrib/samples/deprecated/resource/makefile.gcc: $(SDEPS) ../../contrib/samples/deprecated/resource/resource.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/resource/resource.bkl
+       touch $@
+../../contrib/samples/deprecated/resource/makefile.wat: $(SDEPS) ../../contrib/samples/deprecated/resource/resource.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/resource/resource.bkl
+       touch $@
+../../contrib/samples/deprecated/resource/resource.dsw: $(SDEPS) ../../contrib/samples/deprecated/resource/resource.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/deprecated/resource/resource.bkl
+       touch $@
+
+
+../../contrib/samples/deprecated/treelay/Makefile.in: $(SDEPS) ../../contrib/samples/deprecated/treelay/treelay.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/deprecated/treelay/treelay.bkl
+       touch $@
+../../contrib/samples/deprecated/treelay/makefile.bcc: $(SDEPS) ../../contrib/samples/deprecated/treelay/treelay.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/treelay/treelay.bkl
+       touch $@
+../../contrib/samples/deprecated/treelay/makefile.vc: $(SDEPS) ../../contrib/samples/deprecated/treelay/treelay.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/treelay/treelay.bkl
+       touch $@
+../../contrib/samples/deprecated/treelay/makefile.gcc: $(SDEPS) ../../contrib/samples/deprecated/treelay/treelay.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/treelay/treelay.bkl
+       touch $@
+../../contrib/samples/deprecated/treelay/makefile.wat: $(SDEPS) ../../contrib/samples/deprecated/treelay/treelay.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/deprecated/treelay/treelay.bkl
+       touch $@
+../../contrib/samples/deprecated/treelay/treelay.dsw: $(SDEPS) ../../contrib/samples/deprecated/treelay/treelay.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/deprecated/treelay/treelay.bkl
+       touch $@
+
+
+../../contrib/samples/fl/Makefile.in: $(SDEPS) ../../contrib/samples/fl/fl.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/fl/fl.bkl
+       touch $@
+../../contrib/samples/fl/makefile.bcc: $(SDEPS) ../../contrib/samples/fl/fl.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/fl/fl.bkl
+       touch $@
+../../contrib/samples/fl/makefile.vc: $(SDEPS) ../../contrib/samples/fl/fl.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/fl/fl.bkl
+       touch $@
+../../contrib/samples/fl/makefile.gcc: $(SDEPS) ../../contrib/samples/fl/fl.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/fl/fl.bkl
+       touch $@
+../../contrib/samples/fl/makefile.wat: $(SDEPS) ../../contrib/samples/fl/fl.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/fl/fl.bkl
+       touch $@
+../../contrib/samples/fl/fl.dsw: $(SDEPS) ../../contrib/samples/fl/fl.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../contrib/samples/fl/fl.bkl
+       touch $@
+
+
+../../contrib/samples/gizmos/dynsash/Makefile.in: $(SDEPS) ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       touch $@
+../../contrib/samples/gizmos/dynsash/makefile.bcc: $(SDEPS) ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       touch $@
+../../contrib/samples/gizmos/dynsash/makefile.vc: $(SDEPS) ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       touch $@
+../../contrib/samples/gizmos/dynsash/makefile.gcc: $(SDEPS) ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       touch $@
+../../contrib/samples/gizmos/dynsash/makefile.wat: $(SDEPS) ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       touch $@
+../../contrib/samples/gizmos/dynsash/dynsash.dsw: $(SDEPS) ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/gizmos/dynsash/dynsash.bkl
+       touch $@
+
+
+../../contrib/samples/gizmos/dynsash_switch/Makefile.in: $(SDEPS) ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       touch $@
+../../contrib/samples/gizmos/dynsash_switch/makefile.bcc: $(SDEPS) ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       touch $@
+../../contrib/samples/gizmos/dynsash_switch/makefile.vc: $(SDEPS) ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       touch $@
+../../contrib/samples/gizmos/dynsash_switch/makefile.gcc: $(SDEPS) ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       touch $@
+../../contrib/samples/gizmos/dynsash_switch/makefile.wat: $(SDEPS) ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       touch $@
+../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw: $(SDEPS) ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+       touch $@
+
+
+../../contrib/samples/gizmos/editlbox/Makefile.in: $(SDEPS) ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       touch $@
+../../contrib/samples/gizmos/editlbox/makefile.bcc: $(SDEPS) ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       touch $@
+../../contrib/samples/gizmos/editlbox/makefile.vc: $(SDEPS) ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       touch $@
+../../contrib/samples/gizmos/editlbox/makefile.gcc: $(SDEPS) ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       touch $@
+../../contrib/samples/gizmos/editlbox/makefile.wat: $(SDEPS) ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       touch $@
+../../contrib/samples/gizmos/editlbox/editlbox.dsw: $(SDEPS) ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/gizmos/editlbox/editlbox.bkl
+       touch $@
+
+
+../../contrib/samples/gizmos/led/Makefile.in: $(SDEPS) ../../contrib/samples/gizmos/led/led.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/gizmos/led/led.bkl
+       touch $@
+../../contrib/samples/gizmos/led/makefile.bcc: $(SDEPS) ../../contrib/samples/gizmos/led/led.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/led/led.bkl
+       touch $@
+../../contrib/samples/gizmos/led/makefile.vc: $(SDEPS) ../../contrib/samples/gizmos/led/led.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/led/led.bkl
+       touch $@
+../../contrib/samples/gizmos/led/makefile.gcc: $(SDEPS) ../../contrib/samples/gizmos/led/led.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/led/led.bkl
+       touch $@
+../../contrib/samples/gizmos/led/makefile.wat: $(SDEPS) ../../contrib/samples/gizmos/led/led.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/led/led.bkl
+       touch $@
+../../contrib/samples/gizmos/led/led.dsw: $(SDEPS) ../../contrib/samples/gizmos/led/led.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/gizmos/led/led.bkl
+       touch $@
+
+
+../../contrib/samples/gizmos/multicell/Makefile.in: $(SDEPS) ../../contrib/samples/gizmos/multicell/multicell.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/gizmos/multicell/multicell.bkl
+       touch $@
+../../contrib/samples/gizmos/multicell/makefile.bcc: $(SDEPS) ../../contrib/samples/gizmos/multicell/multicell.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/multicell/multicell.bkl
+       touch $@
+../../contrib/samples/gizmos/multicell/makefile.vc: $(SDEPS) ../../contrib/samples/gizmos/multicell/multicell.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/multicell/multicell.bkl
+       touch $@
+../../contrib/samples/gizmos/multicell/makefile.gcc: $(SDEPS) ../../contrib/samples/gizmos/multicell/multicell.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/multicell/multicell.bkl
+       touch $@
+../../contrib/samples/gizmos/multicell/makefile.wat: $(SDEPS) ../../contrib/samples/gizmos/multicell/multicell.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/multicell/multicell.bkl
+       touch $@
+../../contrib/samples/gizmos/multicell/multicell.dsw: $(SDEPS) ../../contrib/samples/gizmos/multicell/multicell.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/gizmos/multicell/multicell.bkl
+       touch $@
+
+
+../../contrib/samples/gizmos/splittree/Makefile.in: $(SDEPS) ../../contrib/samples/gizmos/splittree/splittree.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/gizmos/splittree/splittree.bkl
+       touch $@
+../../contrib/samples/gizmos/splittree/makefile.bcc: $(SDEPS) ../../contrib/samples/gizmos/splittree/splittree.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/splittree/splittree.bkl
+       touch $@
+../../contrib/samples/gizmos/splittree/makefile.vc: $(SDEPS) ../../contrib/samples/gizmos/splittree/splittree.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/splittree/splittree.bkl
+       touch $@
+../../contrib/samples/gizmos/splittree/makefile.gcc: $(SDEPS) ../../contrib/samples/gizmos/splittree/splittree.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/splittree/splittree.bkl
+       touch $@
+../../contrib/samples/gizmos/splittree/makefile.wat: $(SDEPS) ../../contrib/samples/gizmos/splittree/splittree.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/gizmos/splittree/splittree.bkl
+       touch $@
+../../contrib/samples/gizmos/splittree/splittree.dsw: $(SDEPS) ../../contrib/samples/gizmos/splittree/splittree.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/gizmos/splittree/splittree.bkl
+       touch $@
+
+
+../../contrib/samples/mmedia/Makefile.in: $(SDEPS) ../../contrib/samples/mmedia/mmboard.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/mmedia/mmboard.bkl
+       touch $@
+../../contrib/samples/mmedia/makefile.bcc: $(SDEPS) ../../contrib/samples/mmedia/mmboard.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/mmedia/mmboard.bkl
+       touch $@
+../../contrib/samples/mmedia/makefile.vc: $(SDEPS) ../../contrib/samples/mmedia/mmboard.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/mmedia/mmboard.bkl
+       touch $@
+../../contrib/samples/mmedia/makefile.gcc: $(SDEPS) ../../contrib/samples/mmedia/mmboard.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/mmedia/mmboard.bkl
+       touch $@
+../../contrib/samples/mmedia/makefile.wat: $(SDEPS) ../../contrib/samples/mmedia/mmboard.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/mmedia/mmboard.bkl
+       touch $@
+../../contrib/samples/mmedia/mmboard.dsw: $(SDEPS) ../../contrib/samples/mmedia/mmboard.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../contrib/samples/mmedia/mmboard.bkl
+       touch $@
+
+
+../../contrib/samples/ogl/ogledit/Makefile.in: $(SDEPS) ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       touch $@
+../../contrib/samples/ogl/ogledit/makefile.bcc: $(SDEPS) ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       touch $@
+../../contrib/samples/ogl/ogledit/makefile.vc: $(SDEPS) ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       touch $@
+../../contrib/samples/ogl/ogledit/makefile.gcc: $(SDEPS) ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       touch $@
+../../contrib/samples/ogl/ogledit/makefile.wat: $(SDEPS) ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       touch $@
+../../contrib/samples/ogl/ogledit/ogledit.dsw: $(SDEPS) ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/ogl/ogledit/ogledit.bkl
+       touch $@
+
+
+../../contrib/samples/ogl/studio/Makefile.in: $(SDEPS) ../../contrib/samples/ogl/studio/studio.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/ogl/studio/studio.bkl
+       touch $@
+../../contrib/samples/ogl/studio/makefile.bcc: $(SDEPS) ../../contrib/samples/ogl/studio/studio.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/ogl/studio/studio.bkl
+       touch $@
+../../contrib/samples/ogl/studio/makefile.vc: $(SDEPS) ../../contrib/samples/ogl/studio/studio.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/ogl/studio/studio.bkl
+       touch $@
+../../contrib/samples/ogl/studio/makefile.gcc: $(SDEPS) ../../contrib/samples/ogl/studio/studio.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/ogl/studio/studio.bkl
+       touch $@
+../../contrib/samples/ogl/studio/makefile.wat: $(SDEPS) ../../contrib/samples/ogl/studio/studio.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../../ -DOPTIONS_FILE=../../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/ogl/studio/studio.bkl
+       touch $@
+../../contrib/samples/ogl/studio/studio.dsw: $(SDEPS) ../../contrib/samples/ogl/studio/studio.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../../ $(DSWFLAGS)  ../../contrib/samples/ogl/studio/studio.bkl
+       touch $@
+
+
+../../contrib/samples/plot/Makefile.in: $(SDEPS) ../../contrib/samples/plot/plot.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/plot/plot.bkl
+       touch $@
+../../contrib/samples/plot/makefile.bcc: $(SDEPS) ../../contrib/samples/plot/plot.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/plot/plot.bkl
+       touch $@
+../../contrib/samples/plot/makefile.vc: $(SDEPS) ../../contrib/samples/plot/plot.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/plot/plot.bkl
+       touch $@
+../../contrib/samples/plot/makefile.gcc: $(SDEPS) ../../contrib/samples/plot/plot.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/plot/plot.bkl
+       touch $@
+../../contrib/samples/plot/makefile.wat: $(SDEPS) ../../contrib/samples/plot/plot.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/plot/plot.bkl
+       touch $@
+../../contrib/samples/plot/plot.dsw: $(SDEPS) ../../contrib/samples/plot/plot.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../contrib/samples/plot/plot.bkl
+       touch $@
+
+
+../../contrib/samples/stc/Makefile.in: $(SDEPS) ../../contrib/samples/stc/stctest.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/stc/stctest.bkl
+       touch $@
+../../contrib/samples/stc/makefile.bcc: $(SDEPS) ../../contrib/samples/stc/stctest.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/stc/stctest.bkl
+       touch $@
+../../contrib/samples/stc/makefile.vc: $(SDEPS) ../../contrib/samples/stc/stctest.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/stc/stctest.bkl
+       touch $@
+../../contrib/samples/stc/makefile.gcc: $(SDEPS) ../../contrib/samples/stc/stctest.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/stc/stctest.bkl
+       touch $@
+../../contrib/samples/stc/makefile.wat: $(SDEPS) ../../contrib/samples/stc/stctest.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/stc/stctest.bkl
+       touch $@
+../../contrib/samples/stc/stctest.dsw: $(SDEPS) ../../contrib/samples/stc/stctest.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../contrib/samples/stc/stctest.bkl

        touch $@
 
 
 ../../contrib/samples/svg/Makefile.in: $(SDEPS) ../../contrib/samples/svg/svgtest.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
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/svg/svgtest.bkl

        touch $@
 ../../contrib/samples/svg/makefile.bcc: $(SDEPS) ../../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
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/svg/svgtest.bkl

        touch $@
 ../../contrib/samples/svg/makefile.vc: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/svg/svgtest.bkl

        touch $@
 ../../contrib/samples/svg/makefile.gcc: $(SDEPS) ../../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
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/svg/svgtest.bkl

        touch $@
 ../../contrib/samples/svg/makefile.wat: $(SDEPS) ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/svg/svgtest.bkl

        touch $@
 ../../contrib/samples/svg/svgtest.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../contrib/samples/svg/svgtest.bkl

        touch $@
 
 
 ../../contrib/samples/xrc/Makefile.in: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
        touch $@
 
 
 ../../contrib/samples/xrc/Makefile.in: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/xrc/xrcdemo.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/xrc/xrcdemo.bkl

        touch $@
 ../../contrib/samples/xrc/makefile.bcc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
        touch $@
 ../../contrib/samples/xrc/makefile.bcc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/xrc/xrcdemo.bkl

        touch $@
 ../../contrib/samples/xrc/makefile.vc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
        touch $@
 ../../contrib/samples/xrc/makefile.vc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/xrc/xrcdemo.bkl

        touch $@
 ../../contrib/samples/xrc/makefile.gcc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
        touch $@
 ../../contrib/samples/xrc/makefile.gcc: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/xrc/xrcdemo.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/xrc/xrcdemo.bkl

        touch $@
 ../../contrib/samples/xrc/makefile.wat: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/samples/xrc/xrcdemo.bkl

        touch $@
 ../../contrib/samples/xrc/xrcdemo.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../contrib/samples/xrc/xrcdemo.bkl

        touch $@
 
 
 ../../contrib/utils/wxrc/Makefile.in: $(SDEPS) ../../contrib/utils/wxrc/wxrc.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
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/utils/wxrc/wxrc.bkl

        touch $@
 ../../contrib/utils/wxrc/makefile.bcc: $(SDEPS) ../../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
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../contrib/utils/wxrc/wxrc.bkl

        touch $@
 ../../contrib/utils/wxrc/makefile.vc: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../contrib/utils/wxrc/wxrc.bkl

        touch $@
 ../../contrib/utils/wxrc/makefile.gcc: $(SDEPS) ../../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
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../contrib/utils/wxrc/wxrc.bkl

        touch $@
 ../../contrib/utils/wxrc/makefile.wat: $(SDEPS) ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../contrib/utils/wxrc/wxrc.bkl

        touch $@
 ../../contrib/utils/wxrc/wxrc.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../contrib/utils/wxrc/wxrc.bkl
+       touch $@
+
+
+../../demos/bombs/Makefile.in: $(SDEPS) ../../demos/bombs/bombs.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../demos/bombs/bombs.bkl
+       touch $@
+../../demos/bombs/makefile.bcc: $(SDEPS) ../../demos/bombs/bombs.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../demos/bombs/bombs.bkl
+       touch $@
+../../demos/bombs/makefile.vc: $(SDEPS) ../../demos/bombs/bombs.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../demos/bombs/bombs.bkl
+       touch $@
+../../demos/bombs/makefile.gcc: $(SDEPS) ../../demos/bombs/bombs.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../demos/bombs/bombs.bkl
+       touch $@
+../../demos/bombs/makefile.wat: $(SDEPS) ../../demos/bombs/bombs.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../demos/bombs/bombs.bkl
+       touch $@
+../../demos/bombs/bombs.dsw: $(SDEPS) ../../demos/bombs/bombs.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../demos/bombs/bombs.bkl
+       touch $@
+
+
+../../demos/dbbrowse/Makefile.in: $(SDEPS) ../../demos/dbbrowse/dbbrowse.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../demos/dbbrowse/dbbrowse.bkl
+       touch $@
+../../demos/dbbrowse/makefile.bcc: $(SDEPS) ../../demos/dbbrowse/dbbrowse.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../demos/dbbrowse/dbbrowse.bkl
+       touch $@
+../../demos/dbbrowse/makefile.vc: $(SDEPS) ../../demos/dbbrowse/dbbrowse.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../demos/dbbrowse/dbbrowse.bkl
+       touch $@
+../../demos/dbbrowse/makefile.gcc: $(SDEPS) ../../demos/dbbrowse/dbbrowse.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../demos/dbbrowse/dbbrowse.bkl
+       touch $@
+../../demos/dbbrowse/makefile.wat: $(SDEPS) ../../demos/dbbrowse/dbbrowse.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../demos/dbbrowse/dbbrowse.bkl
+       touch $@
+../../demos/dbbrowse/dbbrowse.dsw: $(SDEPS) ../../demos/dbbrowse/dbbrowse.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../demos/dbbrowse/dbbrowse.bkl
+       touch $@
+
+
+../../demos/Makefile.in: ../../demos/demos.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../demos/demos.bkl
+       touch $@
+../../demos/makefile.bcc: ../../demos/demos.bkl
+       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 ../../demos/demos.bkl
+       touch $@
+../../demos/makefile.vc: ../../demos/demos.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 ../../demos/demos.bkl
+       touch $@
+../../demos/makefile.gcc: ../../demos/demos.bkl
+       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 ../../demos/demos.bkl
+       touch $@
+../../demos/makefile.wat: ../../demos/demos.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 ../../demos/demos.bkl
+       touch $@
+
+
+../../demos/forty/Makefile.in: $(SDEPS) ../../demos/forty/forty.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../demos/forty/forty.bkl
+       touch $@
+../../demos/forty/makefile.bcc: $(SDEPS) ../../demos/forty/forty.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../demos/forty/forty.bkl
+       touch $@
+../../demos/forty/makefile.vc: $(SDEPS) ../../demos/forty/forty.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../demos/forty/forty.bkl
+       touch $@
+../../demos/forty/makefile.gcc: $(SDEPS) ../../demos/forty/forty.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../demos/forty/forty.bkl
+       touch $@
+../../demos/forty/makefile.wat: $(SDEPS) ../../demos/forty/forty.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../demos/forty/forty.bkl
+       touch $@
+../../demos/forty/forty.dsw: $(SDEPS) ../../demos/forty/forty.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../demos/forty/forty.bkl
+       touch $@
+
+
+../../demos/fractal/Makefile.in: $(SDEPS) ../../demos/fractal/fractal.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../demos/fractal/fractal.bkl
+       touch $@
+../../demos/fractal/makefile.bcc: $(SDEPS) ../../demos/fractal/fractal.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../demos/fractal/fractal.bkl
+       touch $@
+../../demos/fractal/makefile.vc: $(SDEPS) ../../demos/fractal/fractal.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../demos/fractal/fractal.bkl
+       touch $@
+../../demos/fractal/makefile.gcc: $(SDEPS) ../../demos/fractal/fractal.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../demos/fractal/fractal.bkl
+       touch $@
+../../demos/fractal/makefile.wat: $(SDEPS) ../../demos/fractal/fractal.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../demos/fractal/fractal.bkl
+       touch $@
+../../demos/fractal/fractal.dsw: $(SDEPS) ../../demos/fractal/fractal.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../demos/fractal/fractal.bkl
+       touch $@
+
+
+../../demos/life/Makefile.in: $(SDEPS) ../../demos/life/life.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../demos/life/life.bkl
+       touch $@
+../../demos/life/makefile.bcc: $(SDEPS) ../../demos/life/life.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../demos/life/life.bkl
+       touch $@
+../../demos/life/makefile.vc: $(SDEPS) ../../demos/life/life.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../demos/life/life.bkl
+       touch $@
+../../demos/life/makefile.gcc: $(SDEPS) ../../demos/life/life.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../demos/life/life.bkl
+       touch $@
+../../demos/life/makefile.wat: $(SDEPS) ../../demos/life/life.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../demos/life/life.bkl
+       touch $@
+../../demos/life/life.dsw: $(SDEPS) ../../demos/life/life.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../demos/life/life.bkl
+       touch $@
+
+
+../../demos/poem/Makefile.in: $(SDEPS) ../../demos/poem/poem.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../demos/poem/poem.bkl
+       touch $@
+../../demos/poem/makefile.bcc: $(SDEPS) ../../demos/poem/poem.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../demos/poem/poem.bkl
+       touch $@
+../../demos/poem/makefile.vc: $(SDEPS) ../../demos/poem/poem.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../demos/poem/poem.bkl
+       touch $@
+../../demos/poem/makefile.gcc: $(SDEPS) ../../demos/poem/poem.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../demos/poem/poem.bkl
+       touch $@
+../../demos/poem/makefile.wat: $(SDEPS) ../../demos/poem/poem.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../demos/poem/poem.bkl
+       touch $@
+../../demos/poem/poem.dsw: $(SDEPS) ../../demos/poem/poem.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../demos/poem/poem.bkl

        touch $@
 
 
 ../../samples/access/Makefile.in: $(SDEPS) ../../samples/access/access.bkl
        touch $@
 
 
 ../../samples/access/Makefile.in: $(SDEPS) ../../samples/access/access.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/access/access.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/access/access.bkl

        touch $@
 ../../samples/access/makefile.bcc: $(SDEPS) ../../samples/access/access.bkl
        touch $@
 ../../samples/access/makefile.bcc: $(SDEPS) ../../samples/access/access.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/access/access.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/access/access.bkl

        touch $@
 ../../samples/access/makefile.vc: $(SDEPS) ../../samples/access/access.bkl
        touch $@
 ../../samples/access/makefile.vc: $(SDEPS) ../../samples/access/access.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/access/access.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/access/access.bkl

        touch $@
 ../../samples/access/makefile.gcc: $(SDEPS) ../../samples/access/access.bkl
        touch $@
 ../../samples/access/makefile.gcc: $(SDEPS) ../../samples/access/access.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/access/access.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/access/access.bkl

        touch $@
 ../../samples/access/makefile.wat: $(SDEPS) ../../samples/access/access.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/access/access.bkl

        touch $@
 ../../samples/access/access.dsw: $(SDEPS) ../../samples/access/access.bkl
        touch $@
 ../../samples/access/access.dsw: $(SDEPS) ../../samples/access/access.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/access/access.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/access/access.bkl

        touch $@
 
 
 ../../samples/artprov/Makefile.in: $(SDEPS) ../../samples/artprov/artprov.bkl
        touch $@
 
 
 ../../samples/artprov/Makefile.in: $(SDEPS) ../../samples/artprov/artprov.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/artprov/artprov.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/artprov/artprov.bkl

        touch $@
 ../../samples/artprov/makefile.bcc: $(SDEPS) ../../samples/artprov/artprov.bkl
        touch $@
 ../../samples/artprov/makefile.bcc: $(SDEPS) ../../samples/artprov/artprov.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/artprov/artprov.bkl

        touch $@
 ../../samples/artprov/makefile.vc: $(SDEPS) ../../samples/artprov/artprov.bkl
        touch $@
 ../../samples/artprov/makefile.vc: $(SDEPS) ../../samples/artprov/artprov.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/artprov/artprov.bkl

        touch $@
 ../../samples/artprov/makefile.gcc: $(SDEPS) ../../samples/artprov/artprov.bkl
        touch $@
 ../../samples/artprov/makefile.gcc: $(SDEPS) ../../samples/artprov/artprov.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/artprov/artprov.bkl

        touch $@
 ../../samples/artprov/makefile.wat: $(SDEPS) ../../samples/artprov/artprov.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/artprov/artprov.bkl

        touch $@
 ../../samples/artprov/artprov.dsw: $(SDEPS) ../../samples/artprov/artprov.bkl
        touch $@
 ../../samples/artprov/artprov.dsw: $(SDEPS) ../../samples/artprov/artprov.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/artprov/artprov.bkl

        touch $@
 
 
 ../../samples/calendar/Makefile.in: $(SDEPS) ../../samples/calendar/calendar.bkl
        touch $@
 
 
 ../../samples/calendar/Makefile.in: $(SDEPS) ../../samples/calendar/calendar.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/calendar/calendar.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/calendar/calendar.bkl

        touch $@
 ../../samples/calendar/makefile.bcc: $(SDEPS) ../../samples/calendar/calendar.bkl
        touch $@
 ../../samples/calendar/makefile.bcc: $(SDEPS) ../../samples/calendar/calendar.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/calendar/calendar.bkl

        touch $@
 ../../samples/calendar/makefile.vc: $(SDEPS) ../../samples/calendar/calendar.bkl
        touch $@
 ../../samples/calendar/makefile.vc: $(SDEPS) ../../samples/calendar/calendar.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/calendar/calendar.bkl

        touch $@
 ../../samples/calendar/makefile.gcc: $(SDEPS) ../../samples/calendar/calendar.bkl
        touch $@
 ../../samples/calendar/makefile.gcc: $(SDEPS) ../../samples/calendar/calendar.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/calendar/calendar.bkl

        touch $@
 ../../samples/calendar/makefile.wat: $(SDEPS) ../../samples/calendar/calendar.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/calendar/calendar.bkl

        touch $@
 ../../samples/calendar/calendar.dsw: $(SDEPS) ../../samples/calendar/calendar.bkl
        touch $@
 ../../samples/calendar/calendar.dsw: $(SDEPS) ../../samples/calendar/calendar.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/calendar/calendar.bkl

        touch $@
 
 
 ../../samples/caret/Makefile.in: $(SDEPS) ../../samples/caret/caret.bkl
        touch $@
 
 
 ../../samples/caret/Makefile.in: $(SDEPS) ../../samples/caret/caret.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/caret/caret.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/caret/caret.bkl

        touch $@
 ../../samples/caret/makefile.bcc: $(SDEPS) ../../samples/caret/caret.bkl
        touch $@
 ../../samples/caret/makefile.bcc: $(SDEPS) ../../samples/caret/caret.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/caret/caret.bkl

        touch $@
 ../../samples/caret/makefile.vc: $(SDEPS) ../../samples/caret/caret.bkl
        touch $@
 ../../samples/caret/makefile.vc: $(SDEPS) ../../samples/caret/caret.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/caret/caret.bkl

        touch $@
 ../../samples/caret/makefile.gcc: $(SDEPS) ../../samples/caret/caret.bkl
        touch $@
 ../../samples/caret/makefile.gcc: $(SDEPS) ../../samples/caret/caret.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/caret/caret.bkl

        touch $@
 ../../samples/caret/makefile.wat: $(SDEPS) ../../samples/caret/caret.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/caret/caret.bkl

        touch $@
 ../../samples/caret/caret.dsw: $(SDEPS) ../../samples/caret/caret.bkl
        touch $@
 ../../samples/caret/caret.dsw: $(SDEPS) ../../samples/caret/caret.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/caret/caret.bkl

        touch $@
 
 
 ../../samples/checklst/Makefile.in: $(SDEPS) ../../samples/checklst/checklst.bkl
        touch $@
 
 
 ../../samples/checklst/Makefile.in: $(SDEPS) ../../samples/checklst/checklst.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/checklst/checklst.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/checklst/checklst.bkl

        touch $@
 ../../samples/checklst/makefile.bcc: $(SDEPS) ../../samples/checklst/checklst.bkl
        touch $@
 ../../samples/checklst/makefile.bcc: $(SDEPS) ../../samples/checklst/checklst.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/checklst/checklst.bkl

        touch $@
 ../../samples/checklst/makefile.vc: $(SDEPS) ../../samples/checklst/checklst.bkl
        touch $@
 ../../samples/checklst/makefile.vc: $(SDEPS) ../../samples/checklst/checklst.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/checklst/checklst.bkl

        touch $@
 ../../samples/checklst/makefile.gcc: $(SDEPS) ../../samples/checklst/checklst.bkl
        touch $@
 ../../samples/checklst/makefile.gcc: $(SDEPS) ../../samples/checklst/checklst.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/checklst/checklst.bkl

        touch $@
 ../../samples/checklst/makefile.wat: $(SDEPS) ../../samples/checklst/checklst.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/checklst/checklst.bkl

        touch $@
 ../../samples/checklst/checklst.dsw: $(SDEPS) ../../samples/checklst/checklst.bkl
        touch $@
 ../../samples/checklst/checklst.dsw: $(SDEPS) ../../samples/checklst/checklst.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/checklst/checklst.bkl

        touch $@
 
 
 ../../samples/config/Makefile.in: $(SDEPS) ../../samples/config/config.bkl
        touch $@
 
 
 ../../samples/config/Makefile.in: $(SDEPS) ../../samples/config/config.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/config/config.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/config/config.bkl

        touch $@
 ../../samples/config/makefile.bcc: $(SDEPS) ../../samples/config/config.bkl
        touch $@
 ../../samples/config/makefile.bcc: $(SDEPS) ../../samples/config/config.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/config/config.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/config/config.bkl

        touch $@
 ../../samples/config/makefile.vc: $(SDEPS) ../../samples/config/config.bkl
        touch $@
 ../../samples/config/makefile.vc: $(SDEPS) ../../samples/config/config.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/config/config.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/config/config.bkl

        touch $@
 ../../samples/config/makefile.gcc: $(SDEPS) ../../samples/config/config.bkl
        touch $@
 ../../samples/config/makefile.gcc: $(SDEPS) ../../samples/config/config.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/config/config.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/config/config.bkl

        touch $@
 ../../samples/config/makefile.wat: $(SDEPS) ../../samples/config/config.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/config/config.bkl

        touch $@
 ../../samples/config/config.dsw: $(SDEPS) ../../samples/config/config.bkl
        touch $@
 ../../samples/config/config.dsw: $(SDEPS) ../../samples/config/config.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/config/config.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/config/config.bkl

        touch $@
 
 
 ../../samples/console/Makefile.in: $(SDEPS) ../../samples/console/console.bkl
        touch $@
 
 
 ../../samples/console/Makefile.in: $(SDEPS) ../../samples/console/console.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/console/console.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/console/console.bkl

        touch $@
 ../../samples/console/makefile.bcc: $(SDEPS) ../../samples/console/console.bkl
        touch $@
 ../../samples/console/makefile.bcc: $(SDEPS) ../../samples/console/console.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/console/console.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/console/console.bkl

        touch $@
 ../../samples/console/makefile.vc: $(SDEPS) ../../samples/console/console.bkl
        touch $@
 ../../samples/console/makefile.vc: $(SDEPS) ../../samples/console/console.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/console/console.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/console/console.bkl

        touch $@
 ../../samples/console/makefile.gcc: $(SDEPS) ../../samples/console/console.bkl
        touch $@
 ../../samples/console/makefile.gcc: $(SDEPS) ../../samples/console/console.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/console/console.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/console/console.bkl

        touch $@
 ../../samples/console/makefile.wat: $(SDEPS) ../../samples/console/console.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/console/console.bkl

        touch $@
 ../../samples/console/console.dsw: $(SDEPS) ../../samples/console/console.bkl
        touch $@
 ../../samples/console/console.dsw: $(SDEPS) ../../samples/console/console.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/console/console.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/console/console.bkl

        touch $@
 
 
 ../../samples/controls/Makefile.in: $(SDEPS) ../../samples/controls/controls.bkl
        touch $@
 
 
 ../../samples/controls/Makefile.in: $(SDEPS) ../../samples/controls/controls.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/controls/controls.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/controls/controls.bkl

        touch $@
 ../../samples/controls/makefile.bcc: $(SDEPS) ../../samples/controls/controls.bkl
        touch $@
 ../../samples/controls/makefile.bcc: $(SDEPS) ../../samples/controls/controls.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/controls/controls.bkl

        touch $@
 ../../samples/controls/makefile.vc: $(SDEPS) ../../samples/controls/controls.bkl
        touch $@
 ../../samples/controls/makefile.vc: $(SDEPS) ../../samples/controls/controls.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/controls/controls.bkl

        touch $@
 ../../samples/controls/makefile.gcc: $(SDEPS) ../../samples/controls/controls.bkl
        touch $@
 ../../samples/controls/makefile.gcc: $(SDEPS) ../../samples/controls/controls.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/controls/controls.bkl

        touch $@
 ../../samples/controls/makefile.wat: $(SDEPS) ../../samples/controls/controls.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/controls/controls.bkl

        touch $@
 ../../samples/controls/controls.dsw: $(SDEPS) ../../samples/controls/controls.bkl
        touch $@
 ../../samples/controls/controls.dsw: $(SDEPS) ../../samples/controls/controls.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/controls/controls.bkl

        touch $@
 
 
 ../../samples/db/Makefile.in: $(SDEPS) ../../samples/db/db.bkl
        touch $@
 
 
 ../../samples/db/Makefile.in: $(SDEPS) ../../samples/db/db.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/db/db.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/db/db.bkl

        touch $@
 ../../samples/db/makefile.bcc: $(SDEPS) ../../samples/db/db.bkl
        touch $@
 ../../samples/db/makefile.bcc: $(SDEPS) ../../samples/db/db.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/db/db.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/db/db.bkl

        touch $@
 ../../samples/db/makefile.vc: $(SDEPS) ../../samples/db/db.bkl
        touch $@
 ../../samples/db/makefile.vc: $(SDEPS) ../../samples/db/db.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/db/db.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/db/db.bkl

        touch $@
 ../../samples/db/makefile.gcc: $(SDEPS) ../../samples/db/db.bkl
        touch $@
 ../../samples/db/makefile.gcc: $(SDEPS) ../../samples/db/db.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/db/db.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/db/db.bkl

        touch $@
 ../../samples/db/makefile.wat: $(SDEPS) ../../samples/db/db.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/db/db.bkl

        touch $@
 ../../samples/db/db.dsw: $(SDEPS) ../../samples/db/db.bkl
        touch $@
 ../../samples/db/db.dsw: $(SDEPS) ../../samples/db/db.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/db/db.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/db/db.bkl

        touch $@
 
 
 ../../samples/dialogs/Makefile.in: $(SDEPS) ../../samples/dialogs/dialogs.bkl
        touch $@
 
 
 ../../samples/dialogs/Makefile.in: $(SDEPS) ../../samples/dialogs/dialogs.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dialogs/dialogs.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dialogs/dialogs.bkl

        touch $@
 ../../samples/dialogs/makefile.bcc: $(SDEPS) ../../samples/dialogs/dialogs.bkl
        touch $@
 ../../samples/dialogs/makefile.bcc: $(SDEPS) ../../samples/dialogs/dialogs.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dialogs/dialogs.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/dialogs/dialogs.bkl

        touch $@
 ../../samples/dialogs/makefile.vc: $(SDEPS) ../../samples/dialogs/dialogs.bkl
        touch $@
 ../../samples/dialogs/makefile.vc: $(SDEPS) ../../samples/dialogs/dialogs.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dialogs/dialogs.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/dialogs/dialogs.bkl

        touch $@
 ../../samples/dialogs/makefile.gcc: $(SDEPS) ../../samples/dialogs/dialogs.bkl
        touch $@
 ../../samples/dialogs/makefile.gcc: $(SDEPS) ../../samples/dialogs/dialogs.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dialogs/dialogs.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/dialogs/dialogs.bkl

        touch $@
 ../../samples/dialogs/makefile.wat: $(SDEPS) ../../samples/dialogs/dialogs.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/dialogs/dialogs.bkl

        touch $@
 ../../samples/dialogs/dialogs.dsw: $(SDEPS) ../../samples/dialogs/dialogs.bkl
        touch $@
 ../../samples/dialogs/dialogs.dsw: $(SDEPS) ../../samples/dialogs/dialogs.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/dialogs/dialogs.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/dialogs/dialogs.bkl

        touch $@
 
 
 ../../samples/dialup/Makefile.in: $(SDEPS) ../../samples/dialup/dialup.bkl
        touch $@
 
 
 ../../samples/dialup/Makefile.in: $(SDEPS) ../../samples/dialup/dialup.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dialup/dialup.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dialup/dialup.bkl

        touch $@
 ../../samples/dialup/makefile.bcc: $(SDEPS) ../../samples/dialup/dialup.bkl
        touch $@
 ../../samples/dialup/makefile.bcc: $(SDEPS) ../../samples/dialup/dialup.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/dialup/dialup.bkl

        touch $@
 ../../samples/dialup/makefile.vc: $(SDEPS) ../../samples/dialup/dialup.bkl
        touch $@
 ../../samples/dialup/makefile.vc: $(SDEPS) ../../samples/dialup/dialup.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/dialup/dialup.bkl

        touch $@
 ../../samples/dialup/makefile.gcc: $(SDEPS) ../../samples/dialup/dialup.bkl
        touch $@
 ../../samples/dialup/makefile.gcc: $(SDEPS) ../../samples/dialup/dialup.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/dialup/dialup.bkl

        touch $@
 ../../samples/dialup/makefile.wat: $(SDEPS) ../../samples/dialup/dialup.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/dialup/dialup.bkl

        touch $@
 ../../samples/dialup/dialup.dsw: $(SDEPS) ../../samples/dialup/dialup.bkl
        touch $@
 ../../samples/dialup/dialup.dsw: $(SDEPS) ../../samples/dialup/dialup.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/dialup/dialup.bkl

        touch $@
 
 
 ../../samples/display/Makefile.in: $(SDEPS) ../../samples/display/display.bkl
        touch $@
 
 
 ../../samples/display/Makefile.in: $(SDEPS) ../../samples/display/display.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/display/display.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/display/display.bkl

        touch $@
 ../../samples/display/makefile.bcc: $(SDEPS) ../../samples/display/display.bkl
        touch $@
 ../../samples/display/makefile.bcc: $(SDEPS) ../../samples/display/display.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/display/display.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/display/display.bkl

        touch $@
 ../../samples/display/makefile.vc: $(SDEPS) ../../samples/display/display.bkl
        touch $@
 ../../samples/display/makefile.vc: $(SDEPS) ../../samples/display/display.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/display/display.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/display/display.bkl

        touch $@
 ../../samples/display/makefile.gcc: $(SDEPS) ../../samples/display/display.bkl
        touch $@
 ../../samples/display/makefile.gcc: $(SDEPS) ../../samples/display/display.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/display/display.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/display/display.bkl

        touch $@
 ../../samples/display/makefile.wat: $(SDEPS) ../../samples/display/display.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/display/display.bkl

        touch $@
 ../../samples/display/display.dsw: $(SDEPS) ../../samples/display/display.bkl
        touch $@
 ../../samples/display/display.dsw: $(SDEPS) ../../samples/display/display.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/display/display.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/display/display.bkl

        touch $@
 
 
 ../../samples/dnd/Makefile.in: $(SDEPS) ../../samples/dnd/dnd.bkl
        touch $@
 
 
 ../../samples/dnd/Makefile.in: $(SDEPS) ../../samples/dnd/dnd.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dnd/dnd.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dnd/dnd.bkl

        touch $@
 ../../samples/dnd/makefile.bcc: $(SDEPS) ../../samples/dnd/dnd.bkl
        touch $@
 ../../samples/dnd/makefile.bcc: $(SDEPS) ../../samples/dnd/dnd.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/dnd/dnd.bkl

        touch $@
 ../../samples/dnd/makefile.vc: $(SDEPS) ../../samples/dnd/dnd.bkl
        touch $@
 ../../samples/dnd/makefile.vc: $(SDEPS) ../../samples/dnd/dnd.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/dnd/dnd.bkl

        touch $@
 ../../samples/dnd/makefile.gcc: $(SDEPS) ../../samples/dnd/dnd.bkl
        touch $@
 ../../samples/dnd/makefile.gcc: $(SDEPS) ../../samples/dnd/dnd.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/dnd/dnd.bkl

        touch $@
 ../../samples/dnd/makefile.wat: $(SDEPS) ../../samples/dnd/dnd.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/dnd/dnd.bkl

        touch $@
 ../../samples/dnd/dnd.dsw: $(SDEPS) ../../samples/dnd/dnd.bkl
        touch $@
 ../../samples/dnd/dnd.dsw: $(SDEPS) ../../samples/dnd/dnd.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/dnd/dnd.bkl

        touch $@
 
 
 ../../samples/docview/Makefile.in: $(SDEPS) ../../samples/docview/docview.bkl
        touch $@
 
 
 ../../samples/docview/Makefile.in: $(SDEPS) ../../samples/docview/docview.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docview/docview.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docview/docview.bkl

        touch $@
 ../../samples/docview/makefile.bcc: $(SDEPS) ../../samples/docview/docview.bkl
        touch $@
 ../../samples/docview/makefile.bcc: $(SDEPS) ../../samples/docview/docview.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/docview/docview.bkl

        touch $@
 ../../samples/docview/makefile.vc: $(SDEPS) ../../samples/docview/docview.bkl
        touch $@
 ../../samples/docview/makefile.vc: $(SDEPS) ../../samples/docview/docview.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/docview/docview.bkl

        touch $@
 ../../samples/docview/makefile.gcc: $(SDEPS) ../../samples/docview/docview.bkl
        touch $@
 ../../samples/docview/makefile.gcc: $(SDEPS) ../../samples/docview/docview.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/docview/docview.bkl

        touch $@
 ../../samples/docview/makefile.wat: $(SDEPS) ../../samples/docview/docview.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/docview/docview.bkl

        touch $@
 ../../samples/docview/docview.dsw: $(SDEPS) ../../samples/docview/docview.bkl
        touch $@
 ../../samples/docview/docview.dsw: $(SDEPS) ../../samples/docview/docview.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/docview/docview.bkl

        touch $@
 
 
 ../../samples/docvwmdi/Makefile.in: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
        touch $@
 
 
 ../../samples/docvwmdi/Makefile.in: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docvwmdi/docvwmdi.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docvwmdi/docvwmdi.bkl

        touch $@
 ../../samples/docvwmdi/makefile.bcc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
        touch $@
 ../../samples/docvwmdi/makefile.bcc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/docvwmdi/docvwmdi.bkl

        touch $@
 ../../samples/docvwmdi/makefile.vc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
        touch $@
 ../../samples/docvwmdi/makefile.vc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/docvwmdi/docvwmdi.bkl

        touch $@
 ../../samples/docvwmdi/makefile.gcc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
        touch $@
 ../../samples/docvwmdi/makefile.gcc: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/docvwmdi/docvwmdi.bkl

        touch $@
 ../../samples/docvwmdi/makefile.wat: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/docvwmdi/docvwmdi.bkl

        touch $@
 ../../samples/docvwmdi/docvwmdi.dsw: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl
        touch $@
 ../../samples/docvwmdi/docvwmdi.dsw: $(SDEPS) ../../samples/docvwmdi/docvwmdi.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/docvwmdi/docvwmdi.bkl

        touch $@
 
 
 ../../samples/dragimag/Makefile.in: $(SDEPS) ../../samples/dragimag/dragimag.bkl
        touch $@
 
 
 ../../samples/dragimag/Makefile.in: $(SDEPS) ../../samples/dragimag/dragimag.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dragimag/dragimag.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dragimag/dragimag.bkl

        touch $@
 ../../samples/dragimag/makefile.bcc: $(SDEPS) ../../samples/dragimag/dragimag.bkl
        touch $@
 ../../samples/dragimag/makefile.bcc: $(SDEPS) ../../samples/dragimag/dragimag.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/dragimag/dragimag.bkl

        touch $@
 ../../samples/dragimag/makefile.vc: $(SDEPS) ../../samples/dragimag/dragimag.bkl
        touch $@
 ../../samples/dragimag/makefile.vc: $(SDEPS) ../../samples/dragimag/dragimag.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/dragimag/dragimag.bkl

        touch $@
 ../../samples/dragimag/makefile.gcc: $(SDEPS) ../../samples/dragimag/dragimag.bkl
        touch $@
 ../../samples/dragimag/makefile.gcc: $(SDEPS) ../../samples/dragimag/dragimag.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/dragimag/dragimag.bkl

        touch $@
 ../../samples/dragimag/makefile.wat: $(SDEPS) ../../samples/dragimag/dragimag.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/dragimag/dragimag.bkl

        touch $@
 ../../samples/dragimag/dragimag.dsw: $(SDEPS) ../../samples/dragimag/dragimag.bkl
        touch $@
 ../../samples/dragimag/dragimag.dsw: $(SDEPS) ../../samples/dragimag/dragimag.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/dragimag/dragimag.bkl

        touch $@
 
 
 ../../samples/drawing/Makefile.in: $(SDEPS) ../../samples/drawing/drawing.bkl
        touch $@
 
 
 ../../samples/drawing/Makefile.in: $(SDEPS) ../../samples/drawing/drawing.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/drawing/drawing.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/drawing/drawing.bkl

        touch $@
 ../../samples/drawing/makefile.bcc: $(SDEPS) ../../samples/drawing/drawing.bkl
        touch $@
 ../../samples/drawing/makefile.bcc: $(SDEPS) ../../samples/drawing/drawing.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/drawing/drawing.bkl

        touch $@
 ../../samples/drawing/makefile.vc: $(SDEPS) ../../samples/drawing/drawing.bkl
        touch $@
 ../../samples/drawing/makefile.vc: $(SDEPS) ../../samples/drawing/drawing.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/drawing/drawing.bkl

        touch $@
 ../../samples/drawing/makefile.gcc: $(SDEPS) ../../samples/drawing/drawing.bkl
        touch $@
 ../../samples/drawing/makefile.gcc: $(SDEPS) ../../samples/drawing/drawing.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/drawing/drawing.bkl

        touch $@
 ../../samples/drawing/makefile.wat: $(SDEPS) ../../samples/drawing/drawing.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/drawing/drawing.bkl

        touch $@
 ../../samples/drawing/drawing.dsw: $(SDEPS) ../../samples/drawing/drawing.bkl
        touch $@
 ../../samples/drawing/drawing.dsw: $(SDEPS) ../../samples/drawing/drawing.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/drawing/drawing.bkl

        touch $@
 
 
 ../../samples/dynamic/Makefile.in: $(SDEPS) ../../samples/dynamic/dynamic.bkl
        touch $@
 
 
 ../../samples/dynamic/Makefile.in: $(SDEPS) ../../samples/dynamic/dynamic.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dynamic/dynamic.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dynamic/dynamic.bkl

        touch $@
 ../../samples/dynamic/makefile.bcc: $(SDEPS) ../../samples/dynamic/dynamic.bkl
        touch $@
 ../../samples/dynamic/makefile.bcc: $(SDEPS) ../../samples/dynamic/dynamic.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/dynamic/dynamic.bkl

        touch $@
 ../../samples/dynamic/makefile.vc: $(SDEPS) ../../samples/dynamic/dynamic.bkl
        touch $@
 ../../samples/dynamic/makefile.vc: $(SDEPS) ../../samples/dynamic/dynamic.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/dynamic/dynamic.bkl

        touch $@
 ../../samples/dynamic/makefile.gcc: $(SDEPS) ../../samples/dynamic/dynamic.bkl
        touch $@
 ../../samples/dynamic/makefile.gcc: $(SDEPS) ../../samples/dynamic/dynamic.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/dynamic/dynamic.bkl

        touch $@
 ../../samples/dynamic/makefile.wat: $(SDEPS) ../../samples/dynamic/dynamic.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/dynamic/dynamic.bkl

        touch $@
 ../../samples/dynamic/dynamic.dsw: $(SDEPS) ../../samples/dynamic/dynamic.bkl
        touch $@
 ../../samples/dynamic/dynamic.dsw: $(SDEPS) ../../samples/dynamic/dynamic.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/dynamic/dynamic.bkl

        touch $@
 
 
 ../../samples/erase/Makefile.in: $(SDEPS) ../../samples/erase/erase.bkl
        touch $@
 
 
 ../../samples/erase/Makefile.in: $(SDEPS) ../../samples/erase/erase.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/erase/erase.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/erase/erase.bkl

        touch $@
 ../../samples/erase/makefile.bcc: $(SDEPS) ../../samples/erase/erase.bkl
        touch $@
 ../../samples/erase/makefile.bcc: $(SDEPS) ../../samples/erase/erase.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/erase/erase.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/erase/erase.bkl

        touch $@
 ../../samples/erase/makefile.vc: $(SDEPS) ../../samples/erase/erase.bkl
        touch $@
 ../../samples/erase/makefile.vc: $(SDEPS) ../../samples/erase/erase.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/erase/erase.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/erase/erase.bkl

        touch $@
 ../../samples/erase/makefile.gcc: $(SDEPS) ../../samples/erase/erase.bkl
        touch $@
 ../../samples/erase/makefile.gcc: $(SDEPS) ../../samples/erase/erase.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/erase/erase.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/erase/erase.bkl

        touch $@
 ../../samples/erase/makefile.wat: $(SDEPS) ../../samples/erase/erase.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/erase/erase.bkl

        touch $@
 ../../samples/erase/erase.dsw: $(SDEPS) ../../samples/erase/erase.bkl
        touch $@
 ../../samples/erase/erase.dsw: $(SDEPS) ../../samples/erase/erase.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/erase/erase.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/erase/erase.bkl

        touch $@
 
 
 ../../samples/event/Makefile.in: $(SDEPS) ../../samples/event/event.bkl
        touch $@
 
 
 ../../samples/event/Makefile.in: $(SDEPS) ../../samples/event/event.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/event/event.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/event/event.bkl

        touch $@
 ../../samples/event/makefile.bcc: $(SDEPS) ../../samples/event/event.bkl
        touch $@
 ../../samples/event/makefile.bcc: $(SDEPS) ../../samples/event/event.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/event/event.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/event/event.bkl

        touch $@
 ../../samples/event/makefile.vc: $(SDEPS) ../../samples/event/event.bkl
        touch $@
 ../../samples/event/makefile.vc: $(SDEPS) ../../samples/event/event.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/event/event.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/event/event.bkl

        touch $@
 ../../samples/event/makefile.gcc: $(SDEPS) ../../samples/event/event.bkl
        touch $@
 ../../samples/event/makefile.gcc: $(SDEPS) ../../samples/event/event.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/event/event.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/event/event.bkl

        touch $@
 ../../samples/event/makefile.wat: $(SDEPS) ../../samples/event/event.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/event/event.bkl

        touch $@
 ../../samples/event/event.dsw: $(SDEPS) ../../samples/event/event.bkl
        touch $@
 ../../samples/event/event.dsw: $(SDEPS) ../../samples/event/event.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/event/event.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/event/event.bkl

        touch $@
 
 
 ../../samples/exec/Makefile.in: $(SDEPS) ../../samples/exec/exec.bkl
        touch $@
 
 
 ../../samples/exec/Makefile.in: $(SDEPS) ../../samples/exec/exec.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/exec/exec.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/exec/exec.bkl

        touch $@
 ../../samples/exec/makefile.bcc: $(SDEPS) ../../samples/exec/exec.bkl
        touch $@
 ../../samples/exec/makefile.bcc: $(SDEPS) ../../samples/exec/exec.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/exec/exec.bkl

        touch $@
 ../../samples/exec/makefile.vc: $(SDEPS) ../../samples/exec/exec.bkl
        touch $@
 ../../samples/exec/makefile.vc: $(SDEPS) ../../samples/exec/exec.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/exec/exec.bkl

        touch $@
 ../../samples/exec/makefile.gcc: $(SDEPS) ../../samples/exec/exec.bkl
        touch $@
 ../../samples/exec/makefile.gcc: $(SDEPS) ../../samples/exec/exec.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/exec/exec.bkl

        touch $@
 ../../samples/exec/makefile.wat: $(SDEPS) ../../samples/exec/exec.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/exec/exec.bkl

        touch $@
 ../../samples/exec/exec.dsw: $(SDEPS) ../../samples/exec/exec.bkl
        touch $@
 ../../samples/exec/exec.dsw: $(SDEPS) ../../samples/exec/exec.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/exec/exec.bkl

        touch $@
 
 
 ../../samples/font/Makefile.in: $(SDEPS) ../../samples/font/font.bkl
        touch $@
 
 
 ../../samples/font/Makefile.in: $(SDEPS) ../../samples/font/font.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/font/font.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/font/font.bkl

        touch $@
 ../../samples/font/makefile.bcc: $(SDEPS) ../../samples/font/font.bkl
        touch $@
 ../../samples/font/makefile.bcc: $(SDEPS) ../../samples/font/font.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/font/font.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/font/font.bkl

        touch $@
 ../../samples/font/makefile.vc: $(SDEPS) ../../samples/font/font.bkl
        touch $@
 ../../samples/font/makefile.vc: $(SDEPS) ../../samples/font/font.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/font/font.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/font/font.bkl

        touch $@
 ../../samples/font/makefile.gcc: $(SDEPS) ../../samples/font/font.bkl
        touch $@
 ../../samples/font/makefile.gcc: $(SDEPS) ../../samples/font/font.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/font/font.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/font/font.bkl

        touch $@
 ../../samples/font/makefile.wat: $(SDEPS) ../../samples/font/font.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/font/font.bkl

        touch $@
 ../../samples/font/font.dsw: $(SDEPS) ../../samples/font/font.bkl
        touch $@
 ../../samples/font/font.dsw: $(SDEPS) ../../samples/font/font.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/font/font.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/font/font.bkl

        touch $@
 
 
 ../../samples/grid/Makefile.in: $(SDEPS) ../../samples/grid/grid.bkl
        touch $@
 
 
 ../../samples/grid/Makefile.in: $(SDEPS) ../../samples/grid/grid.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/grid/grid.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/grid/grid.bkl

        touch $@
 ../../samples/grid/makefile.bcc: $(SDEPS) ../../samples/grid/grid.bkl
        touch $@
 ../../samples/grid/makefile.bcc: $(SDEPS) ../../samples/grid/grid.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/grid/grid.bkl

        touch $@
 ../../samples/grid/makefile.vc: $(SDEPS) ../../samples/grid/grid.bkl
        touch $@
 ../../samples/grid/makefile.vc: $(SDEPS) ../../samples/grid/grid.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/grid/grid.bkl

        touch $@
 ../../samples/grid/makefile.gcc: $(SDEPS) ../../samples/grid/grid.bkl
        touch $@
 ../../samples/grid/makefile.gcc: $(SDEPS) ../../samples/grid/grid.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/grid/grid.bkl

        touch $@
 ../../samples/grid/makefile.wat: $(SDEPS) ../../samples/grid/grid.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/grid/grid.bkl

        touch $@
 ../../samples/grid/grid.dsw: $(SDEPS) ../../samples/grid/grid.bkl
        touch $@
 ../../samples/grid/grid.dsw: $(SDEPS) ../../samples/grid/grid.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/grid/grid.bkl

        touch $@
 
 
 ../../samples/help/Makefile.in: $(SDEPS) ../../samples/help/help.bkl
        touch $@
 
 
 ../../samples/help/Makefile.in: $(SDEPS) ../../samples/help/help.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/help/help.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/help/help.bkl

        touch $@
 ../../samples/help/makefile.bcc: $(SDEPS) ../../samples/help/help.bkl
        touch $@
 ../../samples/help/makefile.bcc: $(SDEPS) ../../samples/help/help.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/help/help.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/help/help.bkl

        touch $@
 ../../samples/help/makefile.vc: $(SDEPS) ../../samples/help/help.bkl
        touch $@
 ../../samples/help/makefile.vc: $(SDEPS) ../../samples/help/help.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/help/help.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/help/help.bkl

        touch $@
 ../../samples/help/makefile.gcc: $(SDEPS) ../../samples/help/help.bkl
        touch $@
 ../../samples/help/makefile.gcc: $(SDEPS) ../../samples/help/help.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/help/help.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/help/help.bkl

        touch $@
 ../../samples/help/makefile.wat: $(SDEPS) ../../samples/help/help.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/help/help.bkl

        touch $@
 ../../samples/help/help.dsw: $(SDEPS) ../../samples/help/help.bkl
        touch $@
 ../../samples/help/help.dsw: $(SDEPS) ../../samples/help/help.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/help/help.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/help/help.bkl

        touch $@
 
 
 ../../samples/htlbox/Makefile.in: $(SDEPS) ../../samples/htlbox/htlbox.bkl
        touch $@
 
 
 ../../samples/htlbox/Makefile.in: $(SDEPS) ../../samples/htlbox/htlbox.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/htlbox/htlbox.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/htlbox/htlbox.bkl

        touch $@
 ../../samples/htlbox/makefile.bcc: $(SDEPS) ../../samples/htlbox/htlbox.bkl
        touch $@
 ../../samples/htlbox/makefile.bcc: $(SDEPS) ../../samples/htlbox/htlbox.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/htlbox/htlbox.bkl

        touch $@
 ../../samples/htlbox/makefile.vc: $(SDEPS) ../../samples/htlbox/htlbox.bkl
        touch $@
 ../../samples/htlbox/makefile.vc: $(SDEPS) ../../samples/htlbox/htlbox.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/htlbox/htlbox.bkl

        touch $@
 ../../samples/htlbox/makefile.gcc: $(SDEPS) ../../samples/htlbox/htlbox.bkl
        touch $@
 ../../samples/htlbox/makefile.gcc: $(SDEPS) ../../samples/htlbox/htlbox.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/htlbox/htlbox.bkl

        touch $@
 ../../samples/htlbox/makefile.wat: $(SDEPS) ../../samples/htlbox/htlbox.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/htlbox/htlbox.bkl

        touch $@
 ../../samples/htlbox/htlbox.dsw: $(SDEPS) ../../samples/htlbox/htlbox.bkl
        touch $@
 ../../samples/htlbox/htlbox.dsw: $(SDEPS) ../../samples/htlbox/htlbox.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/htlbox/htlbox.bkl

        touch $@
 
 
 ../../samples/html/about/Makefile.in: $(SDEPS) ../../samples/html/about/about.bkl
        touch $@
 
 
 ../../samples/html/about/Makefile.in: $(SDEPS) ../../samples/html/about/about.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/about/about.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/about/about.bkl

        touch $@
 ../../samples/html/about/makefile.bcc: $(SDEPS) ../../samples/html/about/about.bkl
        touch $@
 ../../samples/html/about/makefile.bcc: $(SDEPS) ../../samples/html/about/about.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/about/about.bkl

        touch $@
 ../../samples/html/about/makefile.vc: $(SDEPS) ../../samples/html/about/about.bkl
        touch $@
 ../../samples/html/about/makefile.vc: $(SDEPS) ../../samples/html/about/about.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/html/about/about.bkl

        touch $@
 ../../samples/html/about/makefile.gcc: $(SDEPS) ../../samples/html/about/about.bkl
        touch $@
 ../../samples/html/about/makefile.gcc: $(SDEPS) ../../samples/html/about/about.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/about/about.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/about/about.bkl

        touch $@
 ../../samples/html/about/makefile.wat: $(SDEPS) ../../samples/html/about/about.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/html/about/about.bkl

        touch $@
 ../../samples/html/about/about.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/html/about/about.bkl

        touch $@
 
 
 ../../samples/html/help/Makefile.in: $(SDEPS) ../../samples/html/help/help.bkl
        touch $@
 
 
 ../../samples/html/help/Makefile.in: $(SDEPS) ../../samples/html/help/help.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/help/help.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/help/help.bkl

        touch $@
 ../../samples/html/help/makefile.bcc: $(SDEPS) ../../samples/html/help/help.bkl
        touch $@
 ../../samples/html/help/makefile.bcc: $(SDEPS) ../../samples/html/help/help.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/help/help.bkl

        touch $@
 ../../samples/html/help/makefile.vc: $(SDEPS) ../../samples/html/help/help.bkl
        touch $@
 ../../samples/html/help/makefile.vc: $(SDEPS) ../../samples/html/help/help.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/html/help/help.bkl

        touch $@
 ../../samples/html/help/makefile.gcc: $(SDEPS) ../../samples/html/help/help.bkl
        touch $@
 ../../samples/html/help/makefile.gcc: $(SDEPS) ../../samples/html/help/help.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/help/help.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/help/help.bkl

        touch $@
 ../../samples/html/help/makefile.wat: $(SDEPS) ../../samples/html/help/help.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/html/help/help.bkl

        touch $@
 ../../samples/html/help/help.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/html/help/help.bkl

        touch $@
 
 
 ../../samples/html/helpview/Makefile.in: $(SDEPS) ../../samples/html/helpview/helpview.bkl
        touch $@
 
 
 ../../samples/html/helpview/Makefile.in: $(SDEPS) ../../samples/html/helpview/helpview.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/helpview/helpview.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/helpview/helpview.bkl

        touch $@
 ../../samples/html/helpview/makefile.bcc: $(SDEPS) ../../samples/html/helpview/helpview.bkl
        touch $@
 ../../samples/html/helpview/makefile.bcc: $(SDEPS) ../../samples/html/helpview/helpview.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/helpview/helpview.bkl

        touch $@
 ../../samples/html/helpview/makefile.vc: $(SDEPS) ../../samples/html/helpview/helpview.bkl
        touch $@
 ../../samples/html/helpview/makefile.vc: $(SDEPS) ../../samples/html/helpview/helpview.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/html/helpview/helpview.bkl

        touch $@
 ../../samples/html/helpview/makefile.gcc: $(SDEPS) ../../samples/html/helpview/helpview.bkl
        touch $@
 ../../samples/html/helpview/makefile.gcc: $(SDEPS) ../../samples/html/helpview/helpview.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/helpview/helpview.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/helpview/helpview.bkl

        touch $@
 ../../samples/html/helpview/makefile.wat: $(SDEPS) ../../samples/html/helpview/helpview.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/html/helpview/helpview.bkl

        touch $@
 ../../samples/html/helpview/helpview.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/html/helpview/helpview.bkl

        touch $@
 
 
 ../../samples/html/Makefile.in: $(SDEPS) ../../samples/html/html_samples.bkl
        touch $@
 
 
 ../../samples/html/Makefile.in: $(SDEPS) ../../samples/html/html_samples.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/html_samples.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/html_samples.bkl

        touch $@
 ../../samples/html/makefile.bcc: $(SDEPS) ../../samples/html/html_samples.bkl
        touch $@
 ../../samples/html/makefile.bcc: $(SDEPS) ../../samples/html/html_samples.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/html_samples.bkl

        touch $@
 ../../samples/html/makefile.vc: $(SDEPS) ../../samples/html/html_samples.bkl
        touch $@
 ../../samples/html/makefile.vc: $(SDEPS) ../../samples/html/html_samples.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/html/html_samples.bkl

        touch $@
 ../../samples/html/makefile.gcc: $(SDEPS) ../../samples/html/html_samples.bkl
        touch $@
 ../../samples/html/makefile.gcc: $(SDEPS) ../../samples/html/html_samples.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/html_samples.bkl

        touch $@
 ../../samples/html/makefile.wat: $(SDEPS) ../../samples/html/html_samples.bkl
        touch $@
 ../../samples/html/makefile.wat: $(SDEPS) ../../samples/html/html_samples.bkl

-       $(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/html/html_samples.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/html/html_samples.bkl

        touch $@
 
 
 ../../samples/html/printing/Makefile.in: $(SDEPS) ../../samples/html/printing/printing.bkl
        touch $@
 
 
 ../../samples/html/printing/Makefile.in: $(SDEPS) ../../samples/html/printing/printing.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/printing/printing.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/printing/printing.bkl

        touch $@
 ../../samples/html/printing/makefile.bcc: $(SDEPS) ../../samples/html/printing/printing.bkl
        touch $@
 ../../samples/html/printing/makefile.bcc: $(SDEPS) ../../samples/html/printing/printing.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/printing/printing.bkl

        touch $@
 ../../samples/html/printing/makefile.vc: $(SDEPS) ../../samples/html/printing/printing.bkl
        touch $@
 ../../samples/html/printing/makefile.vc: $(SDEPS) ../../samples/html/printing/printing.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/html/printing/printing.bkl

        touch $@
 ../../samples/html/printing/makefile.gcc: $(SDEPS) ../../samples/html/printing/printing.bkl
        touch $@
 ../../samples/html/printing/makefile.gcc: $(SDEPS) ../../samples/html/printing/printing.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/printing/printing.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/printing/printing.bkl

        touch $@
 ../../samples/html/printing/makefile.wat: $(SDEPS) ../../samples/html/printing/printing.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/html/printing/printing.bkl

        touch $@
 ../../samples/html/printing/printing.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/html/printing/printing.bkl

        touch $@
 
 
 ../../samples/html/test/Makefile.in: $(SDEPS) ../../samples/html/test/test.bkl
        touch $@
 
 
 ../../samples/html/test/Makefile.in: $(SDEPS) ../../samples/html/test/test.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/test/test.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/test/test.bkl

        touch $@
 ../../samples/html/test/makefile.bcc: $(SDEPS) ../../samples/html/test/test.bkl
        touch $@
 ../../samples/html/test/makefile.bcc: $(SDEPS) ../../samples/html/test/test.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/test/test.bkl

        touch $@
 ../../samples/html/test/makefile.vc: $(SDEPS) ../../samples/html/test/test.bkl
        touch $@
 ../../samples/html/test/makefile.vc: $(SDEPS) ../../samples/html/test/test.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/html/test/test.bkl

        touch $@
 ../../samples/html/test/makefile.gcc: $(SDEPS) ../../samples/html/test/test.bkl
        touch $@
 ../../samples/html/test/makefile.gcc: $(SDEPS) ../../samples/html/test/test.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/test/test.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/test/test.bkl

        touch $@
 ../../samples/html/test/makefile.wat: $(SDEPS) ../../samples/html/test/test.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/html/test/test.bkl

        touch $@
 ../../samples/html/test/test.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/html/test/test.bkl

        touch $@
 
 
 ../../samples/html/virtual/Makefile.in: $(SDEPS) ../../samples/html/virtual/virtual.bkl
        touch $@
 
 
 ../../samples/html/virtual/Makefile.in: $(SDEPS) ../../samples/html/virtual/virtual.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/virtual/virtual.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/virtual/virtual.bkl

        touch $@
 ../../samples/html/virtual/makefile.bcc: $(SDEPS) ../../samples/html/virtual/virtual.bkl
        touch $@
 ../../samples/html/virtual/makefile.bcc: $(SDEPS) ../../samples/html/virtual/virtual.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/virtual/virtual.bkl

        touch $@
 ../../samples/html/virtual/makefile.vc: $(SDEPS) ../../samples/html/virtual/virtual.bkl
        touch $@
 ../../samples/html/virtual/makefile.vc: $(SDEPS) ../../samples/html/virtual/virtual.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/html/virtual/virtual.bkl

        touch $@
 ../../samples/html/virtual/makefile.gcc: $(SDEPS) ../../samples/html/virtual/virtual.bkl
        touch $@
 ../../samples/html/virtual/makefile.gcc: $(SDEPS) ../../samples/html/virtual/virtual.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/virtual/virtual.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/virtual/virtual.bkl

        touch $@
 ../../samples/html/virtual/makefile.wat: $(SDEPS) ../../samples/html/virtual/virtual.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/html/virtual/virtual.bkl

        touch $@
 ../../samples/html/virtual/virtual.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/html/virtual/virtual.bkl

        touch $@
 
 
 ../../samples/html/widget/Makefile.in: $(SDEPS) ../../samples/html/widget/widget.bkl
        touch $@
 
 
 ../../samples/html/widget/Makefile.in: $(SDEPS) ../../samples/html/widget/widget.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/widget/widget.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/widget/widget.bkl

        touch $@
 ../../samples/html/widget/makefile.bcc: $(SDEPS) ../../samples/html/widget/widget.bkl
        touch $@
 ../../samples/html/widget/makefile.bcc: $(SDEPS) ../../samples/html/widget/widget.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/widget/widget.bkl

        touch $@
 ../../samples/html/widget/makefile.vc: $(SDEPS) ../../samples/html/widget/widget.bkl
        touch $@
 ../../samples/html/widget/makefile.vc: $(SDEPS) ../../samples/html/widget/widget.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/html/widget/widget.bkl

        touch $@
 ../../samples/html/widget/makefile.gcc: $(SDEPS) ../../samples/html/widget/widget.bkl
        touch $@
 ../../samples/html/widget/makefile.gcc: $(SDEPS) ../../samples/html/widget/widget.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/widget/widget.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/widget/widget.bkl

        touch $@
 ../../samples/html/widget/makefile.wat: $(SDEPS) ../../samples/html/widget/widget.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/html/widget/widget.bkl

        touch $@
 ../../samples/html/widget/widget.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/html/widget/widget.bkl

        touch $@
 
 
 ../../samples/html/zip/Makefile.in: $(SDEPS) ../../samples/html/zip/zip.bkl
        touch $@
 
 
 ../../samples/html/zip/Makefile.in: $(SDEPS) ../../samples/html/zip/zip.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/zip/zip.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/html/zip/zip.bkl

        touch $@
 ../../samples/html/zip/makefile.bcc: $(SDEPS) ../../samples/html/zip/zip.bkl
        touch $@
 ../../samples/html/zip/makefile.bcc: $(SDEPS) ../../samples/html/zip/zip.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/zip/zip.bkl

        touch $@
 ../../samples/html/zip/makefile.vc: $(SDEPS) ../../samples/html/zip/zip.bkl
        touch $@
 ../../samples/html/zip/makefile.vc: $(SDEPS) ../../samples/html/zip/zip.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/html/zip/zip.bkl

        touch $@
 ../../samples/html/zip/makefile.gcc: $(SDEPS) ../../samples/html/zip/zip.bkl
        touch $@
 ../../samples/html/zip/makefile.gcc: $(SDEPS) ../../samples/html/zip/zip.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../samples/html/zip/zip.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/html/zip/zip.bkl

        touch $@
 ../../samples/html/zip/makefile.wat: $(SDEPS) ../../samples/html/zip/zip.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/html/zip/zip.bkl

        touch $@
 ../../samples/html/zip/zip.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/html/zip/zip.bkl

        touch $@
 
 
 ../../samples/image/Makefile.in: $(SDEPS) ../../samples/image/image.bkl
        touch $@
 
 
 ../../samples/image/Makefile.in: $(SDEPS) ../../samples/image/image.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/image/image.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/image/image.bkl

        touch $@
 ../../samples/image/makefile.bcc: $(SDEPS) ../../samples/image/image.bkl
        touch $@
 ../../samples/image/makefile.bcc: $(SDEPS) ../../samples/image/image.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/image/image.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/image/image.bkl

        touch $@
 ../../samples/image/makefile.vc: $(SDEPS) ../../samples/image/image.bkl
        touch $@
 ../../samples/image/makefile.vc: $(SDEPS) ../../samples/image/image.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/image/image.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/image/image.bkl

        touch $@
 ../../samples/image/makefile.gcc: $(SDEPS) ../../samples/image/image.bkl
        touch $@
 ../../samples/image/makefile.gcc: $(SDEPS) ../../samples/image/image.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/image/image.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/image/image.bkl

        touch $@
 ../../samples/image/makefile.wat: $(SDEPS) ../../samples/image/image.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/image/image.bkl

        touch $@
 ../../samples/image/image.dsw: $(SDEPS) ../../samples/image/image.bkl
        touch $@
 ../../samples/image/image.dsw: $(SDEPS) ../../samples/image/image.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/image/image.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/image/image.bkl

        touch $@
 
 
 ../../samples/internat/Makefile.in: $(SDEPS) ../../samples/internat/internat.bkl
        touch $@
 
 
 ../../samples/internat/Makefile.in: $(SDEPS) ../../samples/internat/internat.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/internat/internat.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/internat/internat.bkl

        touch $@
 ../../samples/internat/makefile.bcc: $(SDEPS) ../../samples/internat/internat.bkl
        touch $@
 ../../samples/internat/makefile.bcc: $(SDEPS) ../../samples/internat/internat.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/internat/internat.bkl

        touch $@
 ../../samples/internat/makefile.vc: $(SDEPS) ../../samples/internat/internat.bkl
        touch $@
 ../../samples/internat/makefile.vc: $(SDEPS) ../../samples/internat/internat.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/internat/internat.bkl

        touch $@
 ../../samples/internat/makefile.gcc: $(SDEPS) ../../samples/internat/internat.bkl
        touch $@
 ../../samples/internat/makefile.gcc: $(SDEPS) ../../samples/internat/internat.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/internat/internat.bkl

        touch $@
 ../../samples/internat/makefile.wat: $(SDEPS) ../../samples/internat/internat.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/internat/internat.bkl

        touch $@
 ../../samples/internat/internat.dsw: $(SDEPS) ../../samples/internat/internat.bkl
        touch $@
 ../../samples/internat/internat.dsw: $(SDEPS) ../../samples/internat/internat.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/internat/internat.bkl

        touch $@
 
 
 ../../samples/ipc/Makefile.in: $(SDEPS) ../../samples/ipc/ipc.bkl
        touch $@
 
 
 ../../samples/ipc/Makefile.in: $(SDEPS) ../../samples/ipc/ipc.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/ipc/ipc.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/ipc/ipc.bkl

        touch $@
 ../../samples/ipc/makefile.bcc: $(SDEPS) ../../samples/ipc/ipc.bkl
        touch $@
 ../../samples/ipc/makefile.bcc: $(SDEPS) ../../samples/ipc/ipc.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/ipc/ipc.bkl

        touch $@
 ../../samples/ipc/makefile.vc: $(SDEPS) ../../samples/ipc/ipc.bkl
        touch $@
 ../../samples/ipc/makefile.vc: $(SDEPS) ../../samples/ipc/ipc.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/ipc/ipc.bkl

        touch $@
 ../../samples/ipc/makefile.gcc: $(SDEPS) ../../samples/ipc/ipc.bkl
        touch $@
 ../../samples/ipc/makefile.gcc: $(SDEPS) ../../samples/ipc/ipc.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/ipc/ipc.bkl

        touch $@
 ../../samples/ipc/makefile.wat: $(SDEPS) ../../samples/ipc/ipc.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/ipc/ipc.bkl

        touch $@
 ../../samples/ipc/ipc.dsw: $(SDEPS) ../../samples/ipc/ipc.bkl
        touch $@
 ../../samples/ipc/ipc.dsw: $(SDEPS) ../../samples/ipc/ipc.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/ipc/ipc.bkl

        touch $@
 
 
 ../../samples/joytest/Makefile.in: $(SDEPS) ../../samples/joytest/joytest.bkl
        touch $@
 
 
 ../../samples/joytest/Makefile.in: $(SDEPS) ../../samples/joytest/joytest.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/joytest/joytest.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/joytest/joytest.bkl

        touch $@
 ../../samples/joytest/makefile.bcc: $(SDEPS) ../../samples/joytest/joytest.bkl
        touch $@
 ../../samples/joytest/makefile.bcc: $(SDEPS) ../../samples/joytest/joytest.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/joytest/joytest.bkl

        touch $@
 ../../samples/joytest/makefile.vc: $(SDEPS) ../../samples/joytest/joytest.bkl
        touch $@
 ../../samples/joytest/makefile.vc: $(SDEPS) ../../samples/joytest/joytest.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/joytest/joytest.bkl

        touch $@
 ../../samples/joytest/makefile.gcc: $(SDEPS) ../../samples/joytest/joytest.bkl
        touch $@
 ../../samples/joytest/makefile.gcc: $(SDEPS) ../../samples/joytest/joytest.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/joytest/joytest.bkl

        touch $@
 ../../samples/joytest/makefile.wat: $(SDEPS) ../../samples/joytest/joytest.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/joytest/joytest.bkl

        touch $@
 ../../samples/joytest/joytest.dsw: $(SDEPS) ../../samples/joytest/joytest.bkl
        touch $@
 ../../samples/joytest/joytest.dsw: $(SDEPS) ../../samples/joytest/joytest.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/joytest/joytest.bkl

        touch $@
 
 
 ../../samples/keyboard/Makefile.in: $(SDEPS) ../../samples/keyboard/keyboard.bkl
        touch $@
 
 
 ../../samples/keyboard/Makefile.in: $(SDEPS) ../../samples/keyboard/keyboard.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/keyboard/keyboard.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/keyboard/keyboard.bkl

        touch $@
 ../../samples/keyboard/makefile.bcc: $(SDEPS) ../../samples/keyboard/keyboard.bkl
        touch $@
 ../../samples/keyboard/makefile.bcc: $(SDEPS) ../../samples/keyboard/keyboard.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/keyboard/keyboard.bkl

        touch $@
 ../../samples/keyboard/makefile.vc: $(SDEPS) ../../samples/keyboard/keyboard.bkl
        touch $@
 ../../samples/keyboard/makefile.vc: $(SDEPS) ../../samples/keyboard/keyboard.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/keyboard/keyboard.bkl

        touch $@
 ../../samples/keyboard/makefile.gcc: $(SDEPS) ../../samples/keyboard/keyboard.bkl
        touch $@
 ../../samples/keyboard/makefile.gcc: $(SDEPS) ../../samples/keyboard/keyboard.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/keyboard/keyboard.bkl

        touch $@
 ../../samples/keyboard/makefile.wat: $(SDEPS) ../../samples/keyboard/keyboard.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/keyboard/keyboard.bkl

        touch $@
 ../../samples/keyboard/keyboard.dsw: $(SDEPS) ../../samples/keyboard/keyboard.bkl
        touch $@
 ../../samples/keyboard/keyboard.dsw: $(SDEPS) ../../samples/keyboard/keyboard.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/keyboard/keyboard.bkl

        touch $@
 
 
 ../../samples/layout/Makefile.in: $(SDEPS) ../../samples/layout/layout.bkl
        touch $@
 
 
 ../../samples/layout/Makefile.in: $(SDEPS) ../../samples/layout/layout.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/layout/layout.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/layout/layout.bkl

        touch $@
 ../../samples/layout/makefile.bcc: $(SDEPS) ../../samples/layout/layout.bkl
        touch $@
 ../../samples/layout/makefile.bcc: $(SDEPS) ../../samples/layout/layout.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/layout/layout.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/layout/layout.bkl

        touch $@
 ../../samples/layout/makefile.vc: $(SDEPS) ../../samples/layout/layout.bkl
        touch $@
 ../../samples/layout/makefile.vc: $(SDEPS) ../../samples/layout/layout.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/layout/layout.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/layout/layout.bkl

        touch $@
 ../../samples/layout/makefile.gcc: $(SDEPS) ../../samples/layout/layout.bkl
        touch $@
 ../../samples/layout/makefile.gcc: $(SDEPS) ../../samples/layout/layout.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/layout/layout.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/layout/layout.bkl

        touch $@
 ../../samples/layout/makefile.wat: $(SDEPS) ../../samples/layout/layout.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/layout/layout.bkl

        touch $@
 ../../samples/layout/layout.dsw: $(SDEPS) ../../samples/layout/layout.bkl
        touch $@
 ../../samples/layout/layout.dsw: $(SDEPS) ../../samples/layout/layout.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/layout/layout.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/layout/layout.bkl

        touch $@
 
 
 ../../samples/listbox/Makefile.in: $(SDEPS) ../../samples/listbox/listbox.bkl
        touch $@
 
 
 ../../samples/listbox/Makefile.in: $(SDEPS) ../../samples/listbox/listbox.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listbox/listbox.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listbox/listbox.bkl

        touch $@
 ../../samples/listbox/makefile.bcc: $(SDEPS) ../../samples/listbox/listbox.bkl
        touch $@
 ../../samples/listbox/makefile.bcc: $(SDEPS) ../../samples/listbox/listbox.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/listbox/listbox.bkl

        touch $@
 ../../samples/listbox/makefile.vc: $(SDEPS) ../../samples/listbox/listbox.bkl
        touch $@
 ../../samples/listbox/makefile.vc: $(SDEPS) ../../samples/listbox/listbox.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/listbox/listbox.bkl

        touch $@
 ../../samples/listbox/makefile.gcc: $(SDEPS) ../../samples/listbox/listbox.bkl
        touch $@
 ../../samples/listbox/makefile.gcc: $(SDEPS) ../../samples/listbox/listbox.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/listbox/listbox.bkl

        touch $@
 ../../samples/listbox/makefile.wat: $(SDEPS) ../../samples/listbox/listbox.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/listbox/listbox.bkl

        touch $@
 ../../samples/listbox/listbox.dsw: $(SDEPS) ../../samples/listbox/listbox.bkl
        touch $@
 ../../samples/listbox/listbox.dsw: $(SDEPS) ../../samples/listbox/listbox.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/listbox/listbox.bkl

        touch $@
 
 
 ../../samples/listctrl/Makefile.in: $(SDEPS) ../../samples/listctrl/listctrl.bkl
        touch $@
 
 
 ../../samples/listctrl/Makefile.in: $(SDEPS) ../../samples/listctrl/listctrl.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listctrl/listctrl.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listctrl/listctrl.bkl

        touch $@
 ../../samples/listctrl/makefile.bcc: $(SDEPS) ../../samples/listctrl/listctrl.bkl
        touch $@
 ../../samples/listctrl/makefile.bcc: $(SDEPS) ../../samples/listctrl/listctrl.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/listctrl/listctrl.bkl

        touch $@
 ../../samples/listctrl/makefile.vc: $(SDEPS) ../../samples/listctrl/listctrl.bkl
        touch $@
 ../../samples/listctrl/makefile.vc: $(SDEPS) ../../samples/listctrl/listctrl.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/listctrl/listctrl.bkl

        touch $@
 ../../samples/listctrl/makefile.gcc: $(SDEPS) ../../samples/listctrl/listctrl.bkl
        touch $@
 ../../samples/listctrl/makefile.gcc: $(SDEPS) ../../samples/listctrl/listctrl.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/listctrl/listctrl.bkl

        touch $@
 ../../samples/listctrl/makefile.wat: $(SDEPS) ../../samples/listctrl/listctrl.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/listctrl/listctrl.bkl

        touch $@
 ../../samples/listctrl/listctrl.dsw: $(SDEPS) ../../samples/listctrl/listctrl.bkl
        touch $@
 ../../samples/listctrl/listctrl.dsw: $(SDEPS) ../../samples/listctrl/listctrl.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/listctrl/listctrl.bkl

        touch $@
 
 
 ../../samples/mdi/Makefile.in: $(SDEPS) ../../samples/mdi/mdi.bkl
        touch $@
 
 
 ../../samples/mdi/Makefile.in: $(SDEPS) ../../samples/mdi/mdi.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mdi/mdi.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mdi/mdi.bkl

        touch $@
 ../../samples/mdi/makefile.bcc: $(SDEPS) ../../samples/mdi/mdi.bkl
        touch $@
 ../../samples/mdi/makefile.bcc: $(SDEPS) ../../samples/mdi/mdi.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/mdi/mdi.bkl

        touch $@
 ../../samples/mdi/makefile.vc: $(SDEPS) ../../samples/mdi/mdi.bkl
        touch $@
 ../../samples/mdi/makefile.vc: $(SDEPS) ../../samples/mdi/mdi.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/mdi/mdi.bkl

        touch $@
 ../../samples/mdi/makefile.gcc: $(SDEPS) ../../samples/mdi/mdi.bkl
        touch $@
 ../../samples/mdi/makefile.gcc: $(SDEPS) ../../samples/mdi/mdi.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/mdi/mdi.bkl

        touch $@
 ../../samples/mdi/makefile.wat: $(SDEPS) ../../samples/mdi/mdi.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/mdi/mdi.bkl

        touch $@
 ../../samples/mdi/mdi.dsw: $(SDEPS) ../../samples/mdi/mdi.bkl
        touch $@
 ../../samples/mdi/mdi.dsw: $(SDEPS) ../../samples/mdi/mdi.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/mdi/mdi.bkl

        touch $@
 
 
 ../../samples/memcheck/Makefile.in: $(SDEPS) ../../samples/memcheck/memcheck.bkl
        touch $@
 
 
 ../../samples/memcheck/Makefile.in: $(SDEPS) ../../samples/memcheck/memcheck.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/memcheck/memcheck.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/memcheck/memcheck.bkl

        touch $@
 ../../samples/memcheck/makefile.bcc: $(SDEPS) ../../samples/memcheck/memcheck.bkl
        touch $@
 ../../samples/memcheck/makefile.bcc: $(SDEPS) ../../samples/memcheck/memcheck.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/memcheck/memcheck.bkl

        touch $@
 ../../samples/memcheck/makefile.vc: $(SDEPS) ../../samples/memcheck/memcheck.bkl
        touch $@
 ../../samples/memcheck/makefile.vc: $(SDEPS) ../../samples/memcheck/memcheck.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/memcheck/memcheck.bkl

        touch $@
 ../../samples/memcheck/makefile.gcc: $(SDEPS) ../../samples/memcheck/memcheck.bkl
        touch $@
 ../../samples/memcheck/makefile.gcc: $(SDEPS) ../../samples/memcheck/memcheck.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/memcheck/memcheck.bkl

        touch $@
 ../../samples/memcheck/makefile.wat: $(SDEPS) ../../samples/memcheck/memcheck.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/memcheck/memcheck.bkl

        touch $@
 ../../samples/memcheck/memcheck.dsw: $(SDEPS) ../../samples/memcheck/memcheck.bkl
        touch $@
 ../../samples/memcheck/memcheck.dsw: $(SDEPS) ../../samples/memcheck/memcheck.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/memcheck/memcheck.bkl

        touch $@
 
 
 ../../samples/menu/Makefile.in: $(SDEPS) ../../samples/menu/menu.bkl
        touch $@
 
 
 ../../samples/menu/Makefile.in: $(SDEPS) ../../samples/menu/menu.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/menu/menu.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/menu/menu.bkl

        touch $@
 ../../samples/menu/makefile.bcc: $(SDEPS) ../../samples/menu/menu.bkl
        touch $@
 ../../samples/menu/makefile.bcc: $(SDEPS) ../../samples/menu/menu.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/menu/menu.bkl

        touch $@
 ../../samples/menu/makefile.vc: $(SDEPS) ../../samples/menu/menu.bkl
        touch $@
 ../../samples/menu/makefile.vc: $(SDEPS) ../../samples/menu/menu.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/menu/menu.bkl

        touch $@
 ../../samples/menu/makefile.gcc: $(SDEPS) ../../samples/menu/menu.bkl
        touch $@
 ../../samples/menu/makefile.gcc: $(SDEPS) ../../samples/menu/menu.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/menu/menu.bkl

        touch $@
 ../../samples/menu/makefile.wat: $(SDEPS) ../../samples/menu/menu.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/menu/menu.bkl

        touch $@
 ../../samples/menu/menu.dsw: $(SDEPS) ../../samples/menu/menu.bkl
        touch $@
 ../../samples/menu/menu.dsw: $(SDEPS) ../../samples/menu/menu.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/menu/menu.bkl

        touch $@
 
 
 ../../samples/mfc/Makefile.in: $(SDEPS) ../../samples/mfc/mfc.bkl
        touch $@
 
 
 ../../samples/mfc/Makefile.in: $(SDEPS) ../../samples/mfc/mfc.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mfc/mfc.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mfc/mfc.bkl

        touch $@
 ../../samples/mfc/makefile.bcc: $(SDEPS) ../../samples/mfc/mfc.bkl
        touch $@
 ../../samples/mfc/makefile.bcc: $(SDEPS) ../../samples/mfc/mfc.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/mfc/mfc.bkl

        touch $@
 ../../samples/mfc/makefile.vc: $(SDEPS) ../../samples/mfc/mfc.bkl
        touch $@
 ../../samples/mfc/makefile.vc: $(SDEPS) ../../samples/mfc/mfc.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/mfc/mfc.bkl

        touch $@
 ../../samples/mfc/makefile.gcc: $(SDEPS) ../../samples/mfc/mfc.bkl
        touch $@
 ../../samples/mfc/makefile.gcc: $(SDEPS) ../../samples/mfc/mfc.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/mfc/mfc.bkl

        touch $@
 ../../samples/mfc/makefile.wat: $(SDEPS) ../../samples/mfc/mfc.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/mfc/mfc.bkl

        touch $@
 ../../samples/mfc/mfc.dsw: $(SDEPS) ../../samples/mfc/mfc.bkl
        touch $@
 ../../samples/mfc/mfc.dsw: $(SDEPS) ../../samples/mfc/mfc.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/mfc/mfc.bkl

        touch $@
 
 
 ../../samples/minifram/Makefile.in: $(SDEPS) ../../samples/minifram/minifram.bkl
        touch $@
 
 
 ../../samples/minifram/Makefile.in: $(SDEPS) ../../samples/minifram/minifram.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minifram/minifram.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minifram/minifram.bkl

        touch $@
 ../../samples/minifram/makefile.bcc: $(SDEPS) ../../samples/minifram/minifram.bkl
        touch $@
 ../../samples/minifram/makefile.bcc: $(SDEPS) ../../samples/minifram/minifram.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/minifram/minifram.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/minifram/minifram.bkl

        touch $@
 ../../samples/minifram/makefile.vc: $(SDEPS) ../../samples/minifram/minifram.bkl
        touch $@
 ../../samples/minifram/makefile.vc: $(SDEPS) ../../samples/minifram/minifram.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/minifram/minifram.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/minifram/minifram.bkl

        touch $@
 ../../samples/minifram/makefile.gcc: $(SDEPS) ../../samples/minifram/minifram.bkl
        touch $@
 ../../samples/minifram/makefile.gcc: $(SDEPS) ../../samples/minifram/minifram.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/minifram/minifram.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/minifram/minifram.bkl

        touch $@
 ../../samples/minifram/makefile.wat: $(SDEPS) ../../samples/minifram/minifram.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/minifram/minifram.bkl

        touch $@
 ../../samples/minifram/minifram.dsw: $(SDEPS) ../../samples/minifram/minifram.bkl
        touch $@
 ../../samples/minifram/minifram.dsw: $(SDEPS) ../../samples/minifram/minifram.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/minifram/minifram.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/minifram/minifram.bkl

        touch $@
 
 
 ../../samples/minimal/Makefile.in: $(SDEPS) ../../samples/minimal/minimal.bkl
        touch $@
 
 
 ../../samples/minimal/Makefile.in: $(SDEPS) ../../samples/minimal/minimal.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minimal/minimal.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minimal/minimal.bkl

        touch $@
 ../../samples/minimal/makefile.bcc: $(SDEPS) ../../samples/minimal/minimal.bkl
        touch $@
 ../../samples/minimal/makefile.bcc: $(SDEPS) ../../samples/minimal/minimal.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/minimal/minimal.bkl

        touch $@
 ../../samples/minimal/makefile.vc: $(SDEPS) ../../samples/minimal/minimal.bkl
        touch $@
 ../../samples/minimal/makefile.vc: $(SDEPS) ../../samples/minimal/minimal.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/minimal/minimal.bkl

        touch $@
 ../../samples/minimal/makefile.gcc: $(SDEPS) ../../samples/minimal/minimal.bkl
        touch $@
 ../../samples/minimal/makefile.gcc: $(SDEPS) ../../samples/minimal/minimal.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/minimal/minimal.bkl

        touch $@
 ../../samples/minimal/makefile.wat: $(SDEPS) ../../samples/minimal/minimal.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/minimal/minimal.bkl

        touch $@
 ../../samples/minimal/minimal.dsw: $(SDEPS) ../../samples/minimal/minimal.bkl
        touch $@
 ../../samples/minimal/minimal.dsw: $(SDEPS) ../../samples/minimal/minimal.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/minimal/minimal.bkl
+       touch $@
+
+
+../../samples/mobile/Makefile.in: $(SDEPS) ../../samples/mobile/mobile_samples.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/mobile_samples.bkl
+       touch $@
+../../samples/mobile/makefile.bcc: $(SDEPS) ../../samples/mobile/mobile_samples.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile_samples.bkl
+       touch $@
+../../samples/mobile/makefile.vc: $(SDEPS) ../../samples/mobile/mobile_samples.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile_samples.bkl
+       touch $@
+../../samples/mobile/makefile.gcc: $(SDEPS) ../../samples/mobile/mobile_samples.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile_samples.bkl
+       touch $@
+../../samples/mobile/makefile.wat: $(SDEPS) ../../samples/mobile/mobile_samples.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile_samples.bkl
+       touch $@
+
+
+../../samples/mobile/styles/Makefile.in: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/styles/styles.bkl
+       touch $@
+../../samples/mobile/styles/makefile.bcc: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/styles/styles.bkl
+       touch $@
+../../samples/mobile/styles/makefile.vc: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/styles/styles.bkl
+       touch $@
+../../samples/mobile/styles/makefile.gcc: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/styles/styles.bkl
+       touch $@
+../../samples/mobile/styles/makefile.wat: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/styles/styles.bkl
+       touch $@
+../../samples/mobile/styles/styles.dsw: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/mobile/styles/styles.bkl

        touch $@
 
 
        touch $@
 
 

-../../samples/mobile/Makefile.in: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/mobile.bkl
+../../samples/mobile/wxedit/Makefile.in: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/wxedit/wxedit.bkl

        touch $@
        touch $@

-../../samples/mobile/makefile.bcc: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mobile/mobile.bkl
+../../samples/mobile/wxedit/makefile.bcc: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/wxedit/wxedit.bkl

        touch $@
        touch $@

-../../samples/mobile/makefile.vc: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mobile/mobile.bkl
+../../samples/mobile/wxedit/makefile.vc: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/wxedit/wxedit.bkl

        touch $@
        touch $@

-../../samples/mobile/makefile.gcc: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/mobile/mobile.bkl
+../../samples/mobile/wxedit/makefile.gcc: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/wxedit/wxedit.bkl

        touch $@
        touch $@

-../../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
+../../samples/mobile/wxedit/makefile.wat: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/wxedit/wxedit.bkl

        touch $@
        touch $@

-../../samples/mobile/mobile.dsw: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/mobile/mobile.bkl
+../../samples/mobile/wxedit/wxedit.dsw: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/mobile/wxedit/wxedit.bkl

        touch $@
 
 
 ../../samples/multimon/Makefile.in: $(SDEPS) ../../samples/multimon/multimon.bkl
        touch $@
 
 
 ../../samples/multimon/Makefile.in: $(SDEPS) ../../samples/multimon/multimon.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/multimon/multimon.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/multimon/multimon.bkl

        touch $@
 ../../samples/multimon/makefile.bcc: $(SDEPS) ../../samples/multimon/multimon.bkl
        touch $@
 ../../samples/multimon/makefile.bcc: $(SDEPS) ../../samples/multimon/multimon.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/multimon/multimon.bkl

        touch $@
 ../../samples/multimon/makefile.vc: $(SDEPS) ../../samples/multimon/multimon.bkl
        touch $@
 ../../samples/multimon/makefile.vc: $(SDEPS) ../../samples/multimon/multimon.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/multimon/multimon.bkl

        touch $@
 ../../samples/multimon/makefile.gcc: $(SDEPS) ../../samples/multimon/multimon.bkl
        touch $@
 ../../samples/multimon/makefile.gcc: $(SDEPS) ../../samples/multimon/multimon.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/multimon/multimon.bkl

        touch $@
 ../../samples/multimon/makefile.wat: $(SDEPS) ../../samples/multimon/multimon.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/multimon/multimon.bkl

        touch $@
 ../../samples/multimon/multimon.dsw: $(SDEPS) ../../samples/multimon/multimon.bkl
        touch $@
 ../../samples/multimon/multimon.dsw: $(SDEPS) ../../samples/multimon/multimon.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/multimon/multimon.bkl

        touch $@
 
 
 ../../samples/nativdlg/Makefile.in: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
        touch $@
 
 
 ../../samples/nativdlg/Makefile.in: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/nativdlg/nativdlg.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/nativdlg/nativdlg.bkl

        touch $@
 ../../samples/nativdlg/makefile.bcc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
        touch $@
 ../../samples/nativdlg/makefile.bcc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/nativdlg/nativdlg.bkl

        touch $@
 ../../samples/nativdlg/makefile.vc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
        touch $@
 ../../samples/nativdlg/makefile.vc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/nativdlg/nativdlg.bkl

        touch $@
 ../../samples/nativdlg/makefile.gcc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
        touch $@
 ../../samples/nativdlg/makefile.gcc: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/nativdlg/nativdlg.bkl

        touch $@
 ../../samples/nativdlg/makefile.wat: $(SDEPS) ../../samples/nativdlg/nativdlg.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/nativdlg/nativdlg.bkl

        touch $@
 ../../samples/nativdlg/nativdlg.dsw: $(SDEPS) ../../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
-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/newgrid/newgrid.bkl
-       touch $@
-../../samples/newgrid/makefile.bcc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
-       touch $@
-../../samples/newgrid/makefile.vc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
-       touch $@
-../../samples/newgrid/makefile.gcc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
-       touch $@
-../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/nativdlg/nativdlg.bkl

        touch $@
 
 
 ../../samples/notebook/Makefile.in: $(SDEPS) ../../samples/notebook/notebook.bkl
        touch $@
 
 
 ../../samples/notebook/Makefile.in: $(SDEPS) ../../samples/notebook/notebook.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/notebook/notebook.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/notebook/notebook.bkl

        touch $@
 ../../samples/notebook/makefile.bcc: $(SDEPS) ../../samples/notebook/notebook.bkl
        touch $@
 ../../samples/notebook/makefile.bcc: $(SDEPS) ../../samples/notebook/notebook.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/notebook/notebook.bkl

        touch $@
 ../../samples/notebook/makefile.vc: $(SDEPS) ../../samples/notebook/notebook.bkl
        touch $@
 ../../samples/notebook/makefile.vc: $(SDEPS) ../../samples/notebook/notebook.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/notebook/notebook.bkl

        touch $@
 ../../samples/notebook/makefile.gcc: $(SDEPS) ../../samples/notebook/notebook.bkl
        touch $@
 ../../samples/notebook/makefile.gcc: $(SDEPS) ../../samples/notebook/notebook.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/notebook/notebook.bkl

        touch $@
 ../../samples/notebook/makefile.wat: $(SDEPS) ../../samples/notebook/notebook.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/notebook/notebook.bkl

        touch $@
 ../../samples/notebook/notebook.dsw: $(SDEPS) ../../samples/notebook/notebook.bkl
        touch $@
 ../../samples/notebook/notebook.dsw: $(SDEPS) ../../samples/notebook/notebook.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/notebook/notebook.bkl

        touch $@
 
 
 ../../samples/oleauto/Makefile.in: $(SDEPS) ../../samples/oleauto/oleauto.bkl
        touch $@
 
 
 ../../samples/oleauto/Makefile.in: $(SDEPS) ../../samples/oleauto/oleauto.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/oleauto/oleauto.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/oleauto/oleauto.bkl

        touch $@
 ../../samples/oleauto/makefile.bcc: $(SDEPS) ../../samples/oleauto/oleauto.bkl
        touch $@
 ../../samples/oleauto/makefile.bcc: $(SDEPS) ../../samples/oleauto/oleauto.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/oleauto/oleauto.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/oleauto/oleauto.bkl

        touch $@
 ../../samples/oleauto/makefile.vc: $(SDEPS) ../../samples/oleauto/oleauto.bkl
        touch $@
 ../../samples/oleauto/makefile.vc: $(SDEPS) ../../samples/oleauto/oleauto.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/oleauto/oleauto.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/oleauto/oleauto.bkl

        touch $@
 ../../samples/oleauto/makefile.gcc: $(SDEPS) ../../samples/oleauto/oleauto.bkl
        touch $@
 ../../samples/oleauto/makefile.gcc: $(SDEPS) ../../samples/oleauto/oleauto.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/oleauto/oleauto.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/oleauto/oleauto.bkl

        touch $@
 ../../samples/oleauto/makefile.wat: $(SDEPS) ../../samples/oleauto/oleauto.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/oleauto/oleauto.bkl

        touch $@
 ../../samples/oleauto/oleauto.dsw: $(SDEPS) ../../samples/oleauto/oleauto.bkl
        touch $@
 ../../samples/oleauto/oleauto.dsw: $(SDEPS) ../../samples/oleauto/oleauto.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/oleauto/oleauto.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/oleauto/oleauto.bkl

        touch $@
 
 
 ../../samples/opengl/cube/Makefile.in: $(SDEPS) ../../samples/opengl/cube/cube.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
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/cube/cube.bkl

        touch $@
 ../../samples/opengl/cube/makefile.bcc: $(SDEPS) ../../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
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/cube/cube.bkl

        touch $@
 ../../samples/opengl/cube/makefile.vc: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/cube/cube.bkl

        touch $@
 ../../samples/opengl/cube/makefile.gcc: $(SDEPS) ../../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
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/cube/cube.bkl

        touch $@
 ../../samples/opengl/cube/makefile.wat: $(SDEPS) ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/cube/cube.bkl

        touch $@
 ../../samples/opengl/cube/cube.dsw: $(SDEPS) ../../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
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/opengl/cube/cube.bkl
+       touch $@
+
+
+../../samples/opengl/isosurf/Makefile.in: $(SDEPS) ../../samples/opengl/isosurf/isosurf.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/isosurf/isosurf.bkl
+       touch $@
+../../samples/opengl/isosurf/makefile.bcc: $(SDEPS) ../../samples/opengl/isosurf/isosurf.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/isosurf/isosurf.bkl
+       touch $@
+../../samples/opengl/isosurf/makefile.vc: $(SDEPS) ../../samples/opengl/isosurf/isosurf.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/isosurf/isosurf.bkl
+       touch $@
+../../samples/opengl/isosurf/makefile.gcc: $(SDEPS) ../../samples/opengl/isosurf/isosurf.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/isosurf/isosurf.bkl
+       touch $@
+../../samples/opengl/isosurf/makefile.wat: $(SDEPS) ../../samples/opengl/isosurf/isosurf.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/isosurf/isosurf.bkl
+       touch $@
+../../samples/opengl/isosurf/isosurf.dsw: $(SDEPS) ../../samples/opengl/isosurf/isosurf.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/opengl/isosurf/isosurf.bkl

        touch $@
 
 
 ../../samples/opengl/Makefile.in: $(SDEPS) ../../samples/opengl/opengl_samples.bkl
        touch $@
 
 
 ../../samples/opengl/Makefile.in: $(SDEPS) ../../samples/opengl/opengl_samples.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/opengl_samples.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/opengl_samples.bkl

        touch $@
 ../../samples/opengl/makefile.bcc: $(SDEPS) ../../samples/opengl/opengl_samples.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/opengl_samples.bkl

        touch $@
 ../../samples/opengl/makefile.vc: $(SDEPS) ../../samples/opengl/opengl_samples.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/opengl_samples.bkl

        touch $@
 ../../samples/opengl/makefile.gcc: $(SDEPS) ../../samples/opengl/opengl_samples.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/opengl_samples.bkl

        touch $@
 ../../samples/opengl/makefile.wat: $(SDEPS) ../../samples/opengl/opengl_samples.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/opengl_samples.bkl
+       touch $@
+
+
+../../samples/opengl/penguin/Makefile.in: $(SDEPS) ../../samples/opengl/penguin/penguin.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/penguin/penguin.bkl
+       touch $@
+../../samples/opengl/penguin/makefile.bcc: $(SDEPS) ../../samples/opengl/penguin/penguin.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/penguin/penguin.bkl
+       touch $@
+../../samples/opengl/penguin/makefile.vc: $(SDEPS) ../../samples/opengl/penguin/penguin.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/penguin/penguin.bkl
+       touch $@
+../../samples/opengl/penguin/makefile.gcc: $(SDEPS) ../../samples/opengl/penguin/penguin.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/penguin/penguin.bkl
+       touch $@
+../../samples/opengl/penguin/makefile.wat: $(SDEPS) ../../samples/opengl/penguin/penguin.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/opengl/penguin/penguin.bkl
+       touch $@
+../../samples/opengl/penguin/penguin.dsw: $(SDEPS) ../../samples/opengl/penguin/penguin.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/opengl/penguin/penguin.bkl

        touch $@
 
 
 ../../samples/ownerdrw/Makefile.in: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl
        touch $@
 
 
 ../../samples/ownerdrw/Makefile.in: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/ownerdrw/ownerdrw.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/ownerdrw/ownerdrw.bkl

        touch $@
 ../../samples/ownerdrw/makefile.bcc: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl
        touch $@
 ../../samples/ownerdrw/makefile.bcc: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/ownerdrw/ownerdrw.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/ownerdrw/ownerdrw.bkl

        touch $@
 ../../samples/ownerdrw/makefile.vc: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl
        touch $@
 ../../samples/ownerdrw/makefile.vc: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/ownerdrw/ownerdrw.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/ownerdrw/ownerdrw.bkl

        touch $@
 ../../samples/ownerdrw/makefile.gcc: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl
        touch $@
 ../../samples/ownerdrw/makefile.gcc: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/ownerdrw/ownerdrw.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/ownerdrw/ownerdrw.bkl

        touch $@
 ../../samples/ownerdrw/makefile.wat: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/ownerdrw/ownerdrw.bkl

        touch $@
 ../../samples/ownerdrw/ownerdrw.dsw: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl
        touch $@
 ../../samples/ownerdrw/ownerdrw.dsw: $(SDEPS) ../../samples/ownerdrw/ownerdrw.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/ownerdrw/ownerdrw.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/ownerdrw/ownerdrw.bkl

        touch $@
 
 
 ../../samples/png/Makefile.in: $(SDEPS) ../../samples/png/png.bkl
        touch $@
 
 
 ../../samples/png/Makefile.in: $(SDEPS) ../../samples/png/png.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/png/png.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/png/png.bkl

        touch $@
 ../../samples/png/makefile.bcc: $(SDEPS) ../../samples/png/png.bkl
        touch $@
 ../../samples/png/makefile.bcc: $(SDEPS) ../../samples/png/png.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/png/png.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/png/png.bkl

        touch $@
 ../../samples/png/makefile.vc: $(SDEPS) ../../samples/png/png.bkl
        touch $@
 ../../samples/png/makefile.vc: $(SDEPS) ../../samples/png/png.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/png/png.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/png/png.bkl

        touch $@
 ../../samples/png/makefile.gcc: $(SDEPS) ../../samples/png/png.bkl
        touch $@
 ../../samples/png/makefile.gcc: $(SDEPS) ../../samples/png/png.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/png/png.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/png/png.bkl

        touch $@
 ../../samples/png/makefile.wat: $(SDEPS) ../../samples/png/png.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/png/png.bkl

        touch $@
 ../../samples/png/png.dsw: $(SDEPS) ../../samples/png/png.bkl
        touch $@
 ../../samples/png/png.dsw: $(SDEPS) ../../samples/png/png.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/png/png.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/png/png.bkl

        touch $@
 
 
 ../../samples/printing/Makefile.in: $(SDEPS) ../../samples/printing/printing.bkl
        touch $@
 
 
 ../../samples/printing/Makefile.in: $(SDEPS) ../../samples/printing/printing.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/printing/printing.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/printing/printing.bkl

        touch $@
 ../../samples/printing/makefile.bcc: $(SDEPS) ../../samples/printing/printing.bkl
        touch $@
 ../../samples/printing/makefile.bcc: $(SDEPS) ../../samples/printing/printing.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/printing/printing.bkl

        touch $@
 ../../samples/printing/makefile.vc: $(SDEPS) ../../samples/printing/printing.bkl
        touch $@
 ../../samples/printing/makefile.vc: $(SDEPS) ../../samples/printing/printing.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/printing/printing.bkl

        touch $@
 ../../samples/printing/makefile.gcc: $(SDEPS) ../../samples/printing/printing.bkl
        touch $@
 ../../samples/printing/makefile.gcc: $(SDEPS) ../../samples/printing/printing.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/printing/printing.bkl

        touch $@
 ../../samples/printing/makefile.wat: $(SDEPS) ../../samples/printing/printing.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/printing/printing.bkl

        touch $@
 ../../samples/printing/printing.dsw: $(SDEPS) ../../samples/printing/printing.bkl
        touch $@
 ../../samples/printing/printing.dsw: $(SDEPS) ../../samples/printing/printing.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/printing/printing.bkl

        touch $@
 
 
 ../../samples/propsize/Makefile.in: $(SDEPS) ../../samples/propsize/propsize.bkl
        touch $@
 
 
 ../../samples/propsize/Makefile.in: $(SDEPS) ../../samples/propsize/propsize.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/propsize/propsize.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/propsize/propsize.bkl

        touch $@
 ../../samples/propsize/makefile.bcc: $(SDEPS) ../../samples/propsize/propsize.bkl
        touch $@
 ../../samples/propsize/makefile.bcc: $(SDEPS) ../../samples/propsize/propsize.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/propsize/propsize.bkl

        touch $@
 ../../samples/propsize/makefile.vc: $(SDEPS) ../../samples/propsize/propsize.bkl
        touch $@
 ../../samples/propsize/makefile.vc: $(SDEPS) ../../samples/propsize/propsize.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/propsize/propsize.bkl

        touch $@
 ../../samples/propsize/makefile.gcc: $(SDEPS) ../../samples/propsize/propsize.bkl
        touch $@
 ../../samples/propsize/makefile.gcc: $(SDEPS) ../../samples/propsize/propsize.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/propsize/propsize.bkl

        touch $@
 ../../samples/propsize/makefile.wat: $(SDEPS) ../../samples/propsize/propsize.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/propsize/propsize.bkl

        touch $@
 ../../samples/propsize/propsize.dsw: $(SDEPS) ../../samples/propsize/propsize.bkl
        touch $@
 ../../samples/propsize/propsize.dsw: $(SDEPS) ../../samples/propsize/propsize.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/propsize/propsize.bkl

        touch $@
 
 
 ../../samples/regtest/Makefile.in: $(SDEPS) ../../samples/regtest/regtest.bkl
        touch $@
 
 
 ../../samples/regtest/Makefile.in: $(SDEPS) ../../samples/regtest/regtest.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/regtest/regtest.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/regtest/regtest.bkl

        touch $@
 ../../samples/regtest/makefile.bcc: $(SDEPS) ../../samples/regtest/regtest.bkl
        touch $@
 ../../samples/regtest/makefile.bcc: $(SDEPS) ../../samples/regtest/regtest.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/regtest/regtest.bkl

        touch $@
 ../../samples/regtest/makefile.vc: $(SDEPS) ../../samples/regtest/regtest.bkl
        touch $@
 ../../samples/regtest/makefile.vc: $(SDEPS) ../../samples/regtest/regtest.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/regtest/regtest.bkl

        touch $@
 ../../samples/regtest/makefile.gcc: $(SDEPS) ../../samples/regtest/regtest.bkl
        touch $@
 ../../samples/regtest/makefile.gcc: $(SDEPS) ../../samples/regtest/regtest.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/regtest/regtest.bkl

        touch $@
 ../../samples/regtest/makefile.wat: $(SDEPS) ../../samples/regtest/regtest.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/regtest/regtest.bkl

        touch $@
 ../../samples/regtest/regtest.dsw: $(SDEPS) ../../samples/regtest/regtest.bkl
        touch $@
 ../../samples/regtest/regtest.dsw: $(SDEPS) ../../samples/regtest/regtest.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/regtest/regtest.bkl
+       touch $@
+
+
+../../samples/render/Makefile.in: $(SDEPS) ../../samples/render/render.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/render/render.bkl
+       touch $@
+../../samples/render/makefile.bcc: $(SDEPS) ../../samples/render/render.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/render/render.bkl
+       touch $@
+../../samples/render/makefile.vc: $(SDEPS) ../../samples/render/render.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/render/render.bkl
+       touch $@
+../../samples/render/makefile.gcc: $(SDEPS) ../../samples/render/render.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/render/render.bkl
+       touch $@
+../../samples/render/makefile.wat: $(SDEPS) ../../samples/render/render.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/render/render.bkl
+       touch $@
+../../samples/render/render.dsw: $(SDEPS) ../../samples/render/render.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/render/render.bkl

        touch $@
 
 
 ../../samples/richedit/Makefile.in: $(SDEPS) ../../samples/richedit/richedit.bkl
        touch $@
 
 
 ../../samples/richedit/Makefile.in: $(SDEPS) ../../samples/richedit/richedit.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/richedit/richedit.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/richedit/richedit.bkl

        touch $@
 ../../samples/richedit/makefile.bcc: $(SDEPS) ../../samples/richedit/richedit.bkl
        touch $@
 ../../samples/richedit/makefile.bcc: $(SDEPS) ../../samples/richedit/richedit.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/richedit/richedit.bkl

        touch $@
 ../../samples/richedit/makefile.vc: $(SDEPS) ../../samples/richedit/richedit.bkl
        touch $@
 ../../samples/richedit/makefile.vc: $(SDEPS) ../../samples/richedit/richedit.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/richedit/richedit.bkl

        touch $@
 ../../samples/richedit/makefile.gcc: $(SDEPS) ../../samples/richedit/richedit.bkl
        touch $@
 ../../samples/richedit/makefile.gcc: $(SDEPS) ../../samples/richedit/richedit.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/richedit/richedit.bkl

        touch $@
 ../../samples/richedit/makefile.wat: $(SDEPS) ../../samples/richedit/richedit.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/richedit/richedit.bkl

        touch $@
 ../../samples/richedit/richedit.dsw: $(SDEPS) ../../samples/richedit/richedit.bkl
        touch $@
 ../../samples/richedit/richedit.dsw: $(SDEPS) ../../samples/richedit/richedit.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/richedit/richedit.bkl

        touch $@
 
 
 ../../samples/rotate/Makefile.in: $(SDEPS) ../../samples/rotate/rotate.bkl
        touch $@
 
 
 ../../samples/rotate/Makefile.in: $(SDEPS) ../../samples/rotate/rotate.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/rotate/rotate.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/rotate/rotate.bkl

        touch $@
 ../../samples/rotate/makefile.bcc: $(SDEPS) ../../samples/rotate/rotate.bkl
        touch $@
 ../../samples/rotate/makefile.bcc: $(SDEPS) ../../samples/rotate/rotate.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/rotate/rotate.bkl

        touch $@
 ../../samples/rotate/makefile.vc: $(SDEPS) ../../samples/rotate/rotate.bkl
        touch $@
 ../../samples/rotate/makefile.vc: $(SDEPS) ../../samples/rotate/rotate.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/rotate/rotate.bkl

        touch $@
 ../../samples/rotate/makefile.gcc: $(SDEPS) ../../samples/rotate/rotate.bkl
        touch $@
 ../../samples/rotate/makefile.gcc: $(SDEPS) ../../samples/rotate/rotate.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/rotate/rotate.bkl

        touch $@
 ../../samples/rotate/makefile.wat: $(SDEPS) ../../samples/rotate/rotate.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/rotate/rotate.bkl

        touch $@
 ../../samples/rotate/rotate.dsw: $(SDEPS) ../../samples/rotate/rotate.bkl
        touch $@
 ../../samples/rotate/rotate.dsw: $(SDEPS) ../../samples/rotate/rotate.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/rotate/rotate.bkl

        touch $@
 
 
        touch $@
 
 

-../../samples/Makefile.in: ../../samples/samples.bkl
-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/samples.bkl
-       touch $@

 ../../samples/makefile.bcc: ../../samples/samples.bkl
 ../../samples/makefile.bcc: ../../samples/samples.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../build/config.bcc -DWRITE_OPTIONS_FILE=0 ../../samples/samples.bkl
+       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 ../../samples/samples.bkl

        touch $@
 ../../samples/makefile.vc: ../../samples/samples.bkl
        touch $@
 ../../samples/makefile.vc: ../../samples/samples.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../build/config.vc -DWRITE_OPTIONS_FILE=0 ../../samples/samples.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 ../../samples/samples.bkl

        touch $@
 ../../samples/makefile.gcc: ../../samples/samples.bkl
        touch $@
 ../../samples/makefile.gcc: ../../samples/samples.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../build/config.gcc -DWRITE_OPTIONS_FILE=0 ../../samples/samples.bkl
+       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 ../../samples/samples.bkl

        touch $@
 ../../samples/makefile.wat: ../../samples/samples.bkl
        touch $@
 ../../samples/makefile.wat: ../../samples/samples.bkl

-       $(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../build/config.wat -DWRITE_OPTIONS_FILE=0 ../../samples/samples.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 ../../samples/samples.bkl

        touch $@
 
 
 ../../samples/sashtest/Makefile.in: $(SDEPS) ../../samples/sashtest/sashtest.bkl
        touch $@
 
 
 ../../samples/sashtest/Makefile.in: $(SDEPS) ../../samples/sashtest/sashtest.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sashtest/sashtest.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sashtest/sashtest.bkl

        touch $@
 ../../samples/sashtest/makefile.bcc: $(SDEPS) ../../samples/sashtest/sashtest.bkl
        touch $@
 ../../samples/sashtest/makefile.bcc: $(SDEPS) ../../samples/sashtest/sashtest.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/sashtest/sashtest.bkl

        touch $@
 ../../samples/sashtest/makefile.vc: $(SDEPS) ../../samples/sashtest/sashtest.bkl
        touch $@
 ../../samples/sashtest/makefile.vc: $(SDEPS) ../../samples/sashtest/sashtest.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/sashtest/sashtest.bkl

        touch $@
 ../../samples/sashtest/makefile.gcc: $(SDEPS) ../../samples/sashtest/sashtest.bkl
        touch $@
 ../../samples/sashtest/makefile.gcc: $(SDEPS) ../../samples/sashtest/sashtest.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/sashtest/sashtest.bkl

        touch $@
 ../../samples/sashtest/makefile.wat: $(SDEPS) ../../samples/sashtest/sashtest.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/sashtest/sashtest.bkl

        touch $@
 ../../samples/sashtest/sashtest.dsw: $(SDEPS) ../../samples/sashtest/sashtest.bkl
        touch $@
 ../../samples/sashtest/sashtest.dsw: $(SDEPS) ../../samples/sashtest/sashtest.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/sashtest/sashtest.bkl

        touch $@
 
 
 ../../samples/scroll/Makefile.in: $(SDEPS) ../../samples/scroll/scroll.bkl
        touch $@
 
 
 ../../samples/scroll/Makefile.in: $(SDEPS) ../../samples/scroll/scroll.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scroll/scroll.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scroll/scroll.bkl

        touch $@
 ../../samples/scroll/makefile.bcc: $(SDEPS) ../../samples/scroll/scroll.bkl
        touch $@
 ../../samples/scroll/makefile.bcc: $(SDEPS) ../../samples/scroll/scroll.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/scroll/scroll.bkl

        touch $@
 ../../samples/scroll/makefile.vc: $(SDEPS) ../../samples/scroll/scroll.bkl
        touch $@
 ../../samples/scroll/makefile.vc: $(SDEPS) ../../samples/scroll/scroll.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/scroll/scroll.bkl

        touch $@
 ../../samples/scroll/makefile.gcc: $(SDEPS) ../../samples/scroll/scroll.bkl
        touch $@
 ../../samples/scroll/makefile.gcc: $(SDEPS) ../../samples/scroll/scroll.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/scroll/scroll.bkl

        touch $@
 ../../samples/scroll/makefile.wat: $(SDEPS) ../../samples/scroll/scroll.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/scroll/scroll.bkl

        touch $@
 ../../samples/scroll/scroll.dsw: $(SDEPS) ../../samples/scroll/scroll.bkl
        touch $@
 ../../samples/scroll/scroll.dsw: $(SDEPS) ../../samples/scroll/scroll.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/scroll/scroll.bkl

        touch $@
 
 
 ../../samples/scrollsub/Makefile.in: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
        touch $@
 
 
 ../../samples/scrollsub/Makefile.in: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scrollsub/scrollsub.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scrollsub/scrollsub.bkl

        touch $@
 ../../samples/scrollsub/makefile.bcc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
        touch $@
 ../../samples/scrollsub/makefile.bcc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/scrollsub/scrollsub.bkl

        touch $@
 ../../samples/scrollsub/makefile.vc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
        touch $@
 ../../samples/scrollsub/makefile.vc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/scrollsub/scrollsub.bkl

        touch $@
 ../../samples/scrollsub/makefile.gcc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
        touch $@
 ../../samples/scrollsub/makefile.gcc: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/scrollsub/scrollsub.bkl

        touch $@
 ../../samples/scrollsub/makefile.wat: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/scrollsub/scrollsub.bkl

        touch $@
 ../../samples/scrollsub/scrollsub.dsw: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl
        touch $@
 ../../samples/scrollsub/scrollsub.dsw: $(SDEPS) ../../samples/scrollsub/scrollsub.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/scrollsub/scrollsub.bkl

        touch $@
 
 
 ../../samples/shaped/Makefile.in: $(SDEPS) ../../samples/shaped/shaped.bkl
        touch $@
 
 
 ../../samples/shaped/Makefile.in: $(SDEPS) ../../samples/shaped/shaped.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/shaped/shaped.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/shaped/shaped.bkl

        touch $@
 ../../samples/shaped/makefile.bcc: $(SDEPS) ../../samples/shaped/shaped.bkl
        touch $@
 ../../samples/shaped/makefile.bcc: $(SDEPS) ../../samples/shaped/shaped.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/shaped/shaped.bkl

        touch $@
 ../../samples/shaped/makefile.vc: $(SDEPS) ../../samples/shaped/shaped.bkl
        touch $@
 ../../samples/shaped/makefile.vc: $(SDEPS) ../../samples/shaped/shaped.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/shaped/shaped.bkl

        touch $@
 ../../samples/shaped/makefile.gcc: $(SDEPS) ../../samples/shaped/shaped.bkl
        touch $@
 ../../samples/shaped/makefile.gcc: $(SDEPS) ../../samples/shaped/shaped.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/shaped/shaped.bkl

        touch $@
 ../../samples/shaped/makefile.wat: $(SDEPS) ../../samples/shaped/shaped.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/shaped/shaped.bkl

        touch $@
 ../../samples/shaped/shaped.dsw: $(SDEPS) ../../samples/shaped/shaped.bkl
        touch $@
 ../../samples/shaped/shaped.dsw: $(SDEPS) ../../samples/shaped/shaped.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/shaped/shaped.bkl

        touch $@
 
 
 ../../samples/sockets/Makefile.in: $(SDEPS) ../../samples/sockets/sockets.bkl
        touch $@
 
 
 ../../samples/sockets/Makefile.in: $(SDEPS) ../../samples/sockets/sockets.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sockets/sockets.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sockets/sockets.bkl

        touch $@
 ../../samples/sockets/makefile.bcc: $(SDEPS) ../../samples/sockets/sockets.bkl
        touch $@
 ../../samples/sockets/makefile.bcc: $(SDEPS) ../../samples/sockets/sockets.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/sockets/sockets.bkl

        touch $@
 ../../samples/sockets/makefile.vc: $(SDEPS) ../../samples/sockets/sockets.bkl
        touch $@
 ../../samples/sockets/makefile.vc: $(SDEPS) ../../samples/sockets/sockets.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/sockets/sockets.bkl

        touch $@
 ../../samples/sockets/makefile.gcc: $(SDEPS) ../../samples/sockets/sockets.bkl
        touch $@
 ../../samples/sockets/makefile.gcc: $(SDEPS) ../../samples/sockets/sockets.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/sockets/sockets.bkl

        touch $@
 ../../samples/sockets/makefile.wat: $(SDEPS) ../../samples/sockets/sockets.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/sockets/sockets.bkl

        touch $@
 ../../samples/sockets/sockets.dsw: $(SDEPS) ../../samples/sockets/sockets.bkl
        touch $@
 ../../samples/sockets/sockets.dsw: $(SDEPS) ../../samples/sockets/sockets.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/sockets/sockets.bkl

        touch $@
 
 
 ../../samples/splitter/Makefile.in: $(SDEPS) ../../samples/splitter/splitter.bkl
        touch $@
 
 
 ../../samples/splitter/Makefile.in: $(SDEPS) ../../samples/splitter/splitter.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/splitter/splitter.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/splitter/splitter.bkl

        touch $@
 ../../samples/splitter/makefile.bcc: $(SDEPS) ../../samples/splitter/splitter.bkl
        touch $@
 ../../samples/splitter/makefile.bcc: $(SDEPS) ../../samples/splitter/splitter.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/splitter/splitter.bkl

        touch $@
 ../../samples/splitter/makefile.vc: $(SDEPS) ../../samples/splitter/splitter.bkl
        touch $@
 ../../samples/splitter/makefile.vc: $(SDEPS) ../../samples/splitter/splitter.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/splitter/splitter.bkl

        touch $@
 ../../samples/splitter/makefile.gcc: $(SDEPS) ../../samples/splitter/splitter.bkl
        touch $@
 ../../samples/splitter/makefile.gcc: $(SDEPS) ../../samples/splitter/splitter.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/splitter/splitter.bkl

        touch $@
 ../../samples/splitter/makefile.wat: $(SDEPS) ../../samples/splitter/splitter.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/splitter/splitter.bkl

        touch $@
 ../../samples/splitter/splitter.dsw: $(SDEPS) ../../samples/splitter/splitter.bkl
        touch $@
 ../../samples/splitter/splitter.dsw: $(SDEPS) ../../samples/splitter/splitter.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/splitter/splitter.bkl

        touch $@
 
 
 ../../samples/statbar/Makefile.in: $(SDEPS) ../../samples/statbar/statbar.bkl
        touch $@
 
 
 ../../samples/statbar/Makefile.in: $(SDEPS) ../../samples/statbar/statbar.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/statbar/statbar.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/statbar/statbar.bkl

        touch $@
 ../../samples/statbar/makefile.bcc: $(SDEPS) ../../samples/statbar/statbar.bkl
        touch $@
 ../../samples/statbar/makefile.bcc: $(SDEPS) ../../samples/statbar/statbar.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/statbar/statbar.bkl

        touch $@
 ../../samples/statbar/makefile.vc: $(SDEPS) ../../samples/statbar/statbar.bkl
        touch $@
 ../../samples/statbar/makefile.vc: $(SDEPS) ../../samples/statbar/statbar.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/statbar/statbar.bkl

        touch $@
 ../../samples/statbar/makefile.gcc: $(SDEPS) ../../samples/statbar/statbar.bkl
        touch $@
 ../../samples/statbar/makefile.gcc: $(SDEPS) ../../samples/statbar/statbar.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/statbar/statbar.bkl

        touch $@
 ../../samples/statbar/makefile.wat: $(SDEPS) ../../samples/statbar/statbar.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/statbar/statbar.bkl

        touch $@
 ../../samples/statbar/statbar.dsw: $(SDEPS) ../../samples/statbar/statbar.bkl
        touch $@
 ../../samples/statbar/statbar.dsw: $(SDEPS) ../../samples/statbar/statbar.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/statbar/statbar.bkl

        touch $@
 
 
 ../../samples/tab/Makefile.in: $(SDEPS) ../../samples/tab/tab.bkl
        touch $@
 
 
 ../../samples/tab/Makefile.in: $(SDEPS) ../../samples/tab/tab.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/tab/tab.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/tab/tab.bkl

        touch $@
 ../../samples/tab/makefile.bcc: $(SDEPS) ../../samples/tab/tab.bkl
        touch $@
 ../../samples/tab/makefile.bcc: $(SDEPS) ../../samples/tab/tab.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/tab/tab.bkl

        touch $@
 ../../samples/tab/makefile.vc: $(SDEPS) ../../samples/tab/tab.bkl
        touch $@
 ../../samples/tab/makefile.vc: $(SDEPS) ../../samples/tab/tab.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/tab/tab.bkl

        touch $@
 ../../samples/tab/makefile.gcc: $(SDEPS) ../../samples/tab/tab.bkl
        touch $@
 ../../samples/tab/makefile.gcc: $(SDEPS) ../../samples/tab/tab.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/tab/tab.bkl

        touch $@
 ../../samples/tab/makefile.wat: $(SDEPS) ../../samples/tab/tab.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/tab/tab.bkl

        touch $@
 ../../samples/tab/tab.dsw: $(SDEPS) ../../samples/tab/tab.bkl
        touch $@
 ../../samples/tab/tab.dsw: $(SDEPS) ../../samples/tab/tab.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/tab/tab.bkl

        touch $@
 
 
 ../../samples/taskbar/Makefile.in: $(SDEPS) ../../samples/taskbar/taskbar.bkl
        touch $@
 
 
 ../../samples/taskbar/Makefile.in: $(SDEPS) ../../samples/taskbar/taskbar.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/taskbar/taskbar.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/taskbar/taskbar.bkl

        touch $@
 ../../samples/taskbar/makefile.bcc: $(SDEPS) ../../samples/taskbar/taskbar.bkl
        touch $@
 ../../samples/taskbar/makefile.bcc: $(SDEPS) ../../samples/taskbar/taskbar.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/taskbar/taskbar.bkl

        touch $@
 ../../samples/taskbar/makefile.vc: $(SDEPS) ../../samples/taskbar/taskbar.bkl
        touch $@
 ../../samples/taskbar/makefile.vc: $(SDEPS) ../../samples/taskbar/taskbar.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/taskbar/taskbar.bkl

        touch $@
 ../../samples/taskbar/makefile.gcc: $(SDEPS) ../../samples/taskbar/taskbar.bkl
        touch $@
 ../../samples/taskbar/makefile.gcc: $(SDEPS) ../../samples/taskbar/taskbar.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/taskbar/taskbar.bkl

        touch $@
 ../../samples/taskbar/makefile.wat: $(SDEPS) ../../samples/taskbar/taskbar.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/taskbar/taskbar.bkl

        touch $@
 ../../samples/taskbar/taskbar.dsw: $(SDEPS) ../../samples/taskbar/taskbar.bkl
        touch $@
 ../../samples/taskbar/taskbar.dsw: $(SDEPS) ../../samples/taskbar/taskbar.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/taskbar/taskbar.bkl

        touch $@
 
 
 ../../samples/text/Makefile.in: $(SDEPS) ../../samples/text/text.bkl
        touch $@
 
 
 ../../samples/text/Makefile.in: $(SDEPS) ../../samples/text/text.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/text/text.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/text/text.bkl

        touch $@
 ../../samples/text/makefile.bcc: $(SDEPS) ../../samples/text/text.bkl
        touch $@
 ../../samples/text/makefile.bcc: $(SDEPS) ../../samples/text/text.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/text/text.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/text/text.bkl

        touch $@
 ../../samples/text/makefile.vc: $(SDEPS) ../../samples/text/text.bkl
        touch $@
 ../../samples/text/makefile.vc: $(SDEPS) ../../samples/text/text.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/text/text.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/text/text.bkl

        touch $@
 ../../samples/text/makefile.gcc: $(SDEPS) ../../samples/text/text.bkl
        touch $@
 ../../samples/text/makefile.gcc: $(SDEPS) ../../samples/text/text.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/text/text.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/text/text.bkl

        touch $@
 ../../samples/text/makefile.wat: $(SDEPS) ../../samples/text/text.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/text/text.bkl

        touch $@
 ../../samples/text/text.dsw: $(SDEPS) ../../samples/text/text.bkl
        touch $@
 ../../samples/text/text.dsw: $(SDEPS) ../../samples/text/text.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/text/text.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/text/text.bkl

        touch $@
 
 
 ../../samples/thread/Makefile.in: $(SDEPS) ../../samples/thread/thread.bkl
        touch $@
 
 
 ../../samples/thread/Makefile.in: $(SDEPS) ../../samples/thread/thread.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/thread/thread.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/thread/thread.bkl

        touch $@
 ../../samples/thread/makefile.bcc: $(SDEPS) ../../samples/thread/thread.bkl
        touch $@
 ../../samples/thread/makefile.bcc: $(SDEPS) ../../samples/thread/thread.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/thread/thread.bkl

        touch $@
 ../../samples/thread/makefile.vc: $(SDEPS) ../../samples/thread/thread.bkl
        touch $@
 ../../samples/thread/makefile.vc: $(SDEPS) ../../samples/thread/thread.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/thread/thread.bkl

        touch $@
 ../../samples/thread/makefile.gcc: $(SDEPS) ../../samples/thread/thread.bkl
        touch $@
 ../../samples/thread/makefile.gcc: $(SDEPS) ../../samples/thread/thread.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/thread/thread.bkl

        touch $@
 ../../samples/thread/makefile.wat: $(SDEPS) ../../samples/thread/thread.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/thread/thread.bkl

        touch $@
 ../../samples/thread/thread.dsw: $(SDEPS) ../../samples/thread/thread.bkl
        touch $@
 ../../samples/thread/thread.dsw: $(SDEPS) ../../samples/thread/thread.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/thread/thread.bkl

        touch $@
 
 
 ../../samples/toolbar/Makefile.in: $(SDEPS) ../../samples/toolbar/toolbar.bkl
        touch $@
 
 
 ../../samples/toolbar/Makefile.in: $(SDEPS) ../../samples/toolbar/toolbar.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/toolbar/toolbar.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/toolbar/toolbar.bkl

        touch $@
 ../../samples/toolbar/makefile.bcc: $(SDEPS) ../../samples/toolbar/toolbar.bkl
        touch $@
 ../../samples/toolbar/makefile.bcc: $(SDEPS) ../../samples/toolbar/toolbar.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/toolbar/toolbar.bkl

        touch $@
 ../../samples/toolbar/makefile.vc: $(SDEPS) ../../samples/toolbar/toolbar.bkl
        touch $@
 ../../samples/toolbar/makefile.vc: $(SDEPS) ../../samples/toolbar/toolbar.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/toolbar/toolbar.bkl

        touch $@
 ../../samples/toolbar/makefile.gcc: $(SDEPS) ../../samples/toolbar/toolbar.bkl
        touch $@
 ../../samples/toolbar/makefile.gcc: $(SDEPS) ../../samples/toolbar/toolbar.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/toolbar/toolbar.bkl

        touch $@
 ../../samples/toolbar/makefile.wat: $(SDEPS) ../../samples/toolbar/toolbar.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/toolbar/toolbar.bkl

        touch $@
 ../../samples/toolbar/toolbar.dsw: $(SDEPS) ../../samples/toolbar/toolbar.bkl
        touch $@
 ../../samples/toolbar/toolbar.dsw: $(SDEPS) ../../samples/toolbar/toolbar.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/toolbar/toolbar.bkl

        touch $@
 
 
 ../../samples/treectrl/Makefile.in: $(SDEPS) ../../samples/treectrl/treectrl.bkl
        touch $@
 
 
 ../../samples/treectrl/Makefile.in: $(SDEPS) ../../samples/treectrl/treectrl.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/treectrl/treectrl.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/treectrl/treectrl.bkl

        touch $@
 ../../samples/treectrl/makefile.bcc: $(SDEPS) ../../samples/treectrl/treectrl.bkl
        touch $@
 ../../samples/treectrl/makefile.bcc: $(SDEPS) ../../samples/treectrl/treectrl.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/treectrl/treectrl.bkl

        touch $@
 ../../samples/treectrl/makefile.vc: $(SDEPS) ../../samples/treectrl/treectrl.bkl
        touch $@
 ../../samples/treectrl/makefile.vc: $(SDEPS) ../../samples/treectrl/treectrl.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/treectrl/treectrl.bkl

        touch $@
 ../../samples/treectrl/makefile.gcc: $(SDEPS) ../../samples/treectrl/treectrl.bkl
        touch $@
 ../../samples/treectrl/makefile.gcc: $(SDEPS) ../../samples/treectrl/treectrl.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/treectrl/treectrl.bkl

        touch $@
 ../../samples/treectrl/makefile.wat: $(SDEPS) ../../samples/treectrl/treectrl.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/treectrl/treectrl.bkl

        touch $@
 ../../samples/treectrl/treectrl.dsw: $(SDEPS) ../../samples/treectrl/treectrl.bkl
        touch $@
 ../../samples/treectrl/treectrl.dsw: $(SDEPS) ../../samples/treectrl/treectrl.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/treectrl/treectrl.bkl

        touch $@
 
 
 ../../samples/typetest/Makefile.in: $(SDEPS) ../../samples/typetest/typetest.bkl
        touch $@
 
 
 ../../samples/typetest/Makefile.in: $(SDEPS) ../../samples/typetest/typetest.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/typetest/typetest.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/typetest/typetest.bkl

        touch $@
 ../../samples/typetest/makefile.bcc: $(SDEPS) ../../samples/typetest/typetest.bkl
        touch $@
 ../../samples/typetest/makefile.bcc: $(SDEPS) ../../samples/typetest/typetest.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/typetest/typetest.bkl

        touch $@
 ../../samples/typetest/makefile.vc: $(SDEPS) ../../samples/typetest/typetest.bkl
        touch $@
 ../../samples/typetest/makefile.vc: $(SDEPS) ../../samples/typetest/typetest.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/typetest/typetest.bkl

        touch $@
 ../../samples/typetest/makefile.gcc: $(SDEPS) ../../samples/typetest/typetest.bkl
        touch $@
 ../../samples/typetest/makefile.gcc: $(SDEPS) ../../samples/typetest/typetest.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/typetest/typetest.bkl

        touch $@
 ../../samples/typetest/makefile.wat: $(SDEPS) ../../samples/typetest/typetest.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/typetest/typetest.bkl

        touch $@
 ../../samples/typetest/typetest.dsw: $(SDEPS) ../../samples/typetest/typetest.bkl
        touch $@
 ../../samples/typetest/typetest.dsw: $(SDEPS) ../../samples/typetest/typetest.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/typetest/typetest.bkl

        touch $@
 
 
 ../../samples/validate/Makefile.in: $(SDEPS) ../../samples/validate/validate.bkl
        touch $@
 
 
 ../../samples/validate/Makefile.in: $(SDEPS) ../../samples/validate/validate.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/validate/validate.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/validate/validate.bkl

        touch $@
 ../../samples/validate/makefile.bcc: $(SDEPS) ../../samples/validate/validate.bkl
        touch $@
 ../../samples/validate/makefile.bcc: $(SDEPS) ../../samples/validate/validate.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/validate/validate.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/validate/validate.bkl

        touch $@
 ../../samples/validate/makefile.vc: $(SDEPS) ../../samples/validate/validate.bkl
        touch $@
 ../../samples/validate/makefile.vc: $(SDEPS) ../../samples/validate/validate.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/validate/validate.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/validate/validate.bkl

        touch $@
 ../../samples/validate/makefile.gcc: $(SDEPS) ../../samples/validate/validate.bkl
        touch $@
 ../../samples/validate/makefile.gcc: $(SDEPS) ../../samples/validate/validate.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/validate/validate.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/validate/validate.bkl

        touch $@
 ../../samples/validate/makefile.wat: $(SDEPS) ../../samples/validate/validate.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/validate/validate.bkl

        touch $@
 ../../samples/validate/validate.dsw: $(SDEPS) ../../samples/validate/validate.bkl
        touch $@
 ../../samples/validate/validate.dsw: $(SDEPS) ../../samples/validate/validate.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/validate/validate.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/validate/validate.bkl

        touch $@
 
 
 ../../samples/vscroll/Makefile.in: $(SDEPS) ../../samples/vscroll/vscroll.bkl
        touch $@
 
 
 ../../samples/vscroll/Makefile.in: $(SDEPS) ../../samples/vscroll/vscroll.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/vscroll/vscroll.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/vscroll/vscroll.bkl

        touch $@
 ../../samples/vscroll/makefile.bcc: $(SDEPS) ../../samples/vscroll/vscroll.bkl
        touch $@
 ../../samples/vscroll/makefile.bcc: $(SDEPS) ../../samples/vscroll/vscroll.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/vscroll/vscroll.bkl

        touch $@
 ../../samples/vscroll/makefile.vc: $(SDEPS) ../../samples/vscroll/vscroll.bkl
        touch $@
 ../../samples/vscroll/makefile.vc: $(SDEPS) ../../samples/vscroll/vscroll.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/vscroll/vscroll.bkl

        touch $@
 ../../samples/vscroll/makefile.gcc: $(SDEPS) ../../samples/vscroll/vscroll.bkl
        touch $@
 ../../samples/vscroll/makefile.gcc: $(SDEPS) ../../samples/vscroll/vscroll.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/vscroll/vscroll.bkl

        touch $@
 ../../samples/vscroll/makefile.wat: $(SDEPS) ../../samples/vscroll/vscroll.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/vscroll/vscroll.bkl

        touch $@
 ../../samples/vscroll/vscroll.dsw: $(SDEPS) ../../samples/vscroll/vscroll.bkl
        touch $@
 ../../samples/vscroll/vscroll.dsw: $(SDEPS) ../../samples/vscroll/vscroll.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/vscroll/vscroll.bkl

        touch $@
 
 
 ../../samples/widgets/Makefile.in: $(SDEPS) ../../samples/widgets/widgets.bkl
        touch $@
 
 
 ../../samples/widgets/Makefile.in: $(SDEPS) ../../samples/widgets/widgets.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/widgets/widgets.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/widgets/widgets.bkl

        touch $@
 ../../samples/widgets/makefile.bcc: $(SDEPS) ../../samples/widgets/widgets.bkl
        touch $@
 ../../samples/widgets/makefile.bcc: $(SDEPS) ../../samples/widgets/widgets.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/widgets/widgets.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/widgets/widgets.bkl

        touch $@
 ../../samples/widgets/makefile.vc: $(SDEPS) ../../samples/widgets/widgets.bkl
        touch $@
 ../../samples/widgets/makefile.vc: $(SDEPS) ../../samples/widgets/widgets.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/widgets/widgets.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/widgets/widgets.bkl

        touch $@
 ../../samples/widgets/makefile.gcc: $(SDEPS) ../../samples/widgets/widgets.bkl
        touch $@
 ../../samples/widgets/makefile.gcc: $(SDEPS) ../../samples/widgets/widgets.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/widgets/widgets.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/widgets/widgets.bkl

        touch $@
 ../../samples/widgets/makefile.wat: $(SDEPS) ../../samples/widgets/widgets.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/widgets/widgets.bkl

        touch $@
 ../../samples/widgets/widgets.dsw: $(SDEPS) ../../samples/widgets/widgets.bkl
        touch $@
 ../../samples/widgets/widgets.dsw: $(SDEPS) ../../samples/widgets/widgets.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/widgets/widgets.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/widgets/widgets.bkl

        touch $@
 
 
 ../../samples/wizard/Makefile.in: $(SDEPS) ../../samples/wizard/wizard.bkl
        touch $@
 
 
 ../../samples/wizard/Makefile.in: $(SDEPS) ../../samples/wizard/wizard.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wizard/wizard.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wizard/wizard.bkl

        touch $@
 ../../samples/wizard/makefile.bcc: $(SDEPS) ../../samples/wizard/wizard.bkl
        touch $@
 ../../samples/wizard/makefile.bcc: $(SDEPS) ../../samples/wizard/wizard.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/wizard/wizard.bkl

        touch $@
 ../../samples/wizard/makefile.vc: $(SDEPS) ../../samples/wizard/wizard.bkl
        touch $@
 ../../samples/wizard/makefile.vc: $(SDEPS) ../../samples/wizard/wizard.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/wizard/wizard.bkl

        touch $@
 ../../samples/wizard/makefile.gcc: $(SDEPS) ../../samples/wizard/wizard.bkl
        touch $@
 ../../samples/wizard/makefile.gcc: $(SDEPS) ../../samples/wizard/wizard.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/wizard/wizard.bkl

        touch $@
 ../../samples/wizard/makefile.wat: $(SDEPS) ../../samples/wizard/wizard.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/wizard/wizard.bkl

        touch $@
 ../../samples/wizard/wizard.dsw: $(SDEPS) ../../samples/wizard/wizard.bkl
        touch $@
 ../../samples/wizard/wizard.dsw: $(SDEPS) ../../samples/wizard/wizard.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/wizard/wizard.bkl

        touch $@
 
 
 ../../samples/wxtest/Makefile.in: $(SDEPS) ../../samples/wxtest/wxtest.bkl
        touch $@
 
 
 ../../samples/wxtest/Makefile.in: $(SDEPS) ../../samples/wxtest/wxtest.bkl

-       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wxtest/wxtest.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wxtest/wxtest.bkl

        touch $@
 ../../samples/wxtest/makefile.bcc: $(SDEPS) ../../samples/wxtest/wxtest.bkl
        touch $@
 ../../samples/wxtest/makefile.bcc: $(SDEPS) ../../samples/wxtest/wxtest.bkl

-       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/wxtest/wxtest.bkl

        touch $@
 ../../samples/wxtest/makefile.vc: $(SDEPS) ../../samples/wxtest/wxtest.bkl
        touch $@
 ../../samples/wxtest/makefile.vc: $(SDEPS) ../../samples/wxtest/wxtest.bkl

-       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/wxtest/wxtest.bkl

        touch $@
 ../../samples/wxtest/makefile.gcc: $(SDEPS) ../../samples/wxtest/wxtest.bkl
        touch $@
 ../../samples/wxtest/makefile.gcc: $(SDEPS) ../../samples/wxtest/wxtest.bkl

-       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/wxtest/wxtest.bkl

        touch $@
 ../../samples/wxtest/makefile.wat: $(SDEPS) ../../samples/wxtest/wxtest.bkl
        touch $@
 ../../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
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/wxtest/wxtest.bkl

        touch $@
 ../../samples/wxtest/wxtest.dsw: $(SDEPS) ../../samples/wxtest/wxtest.bkl
        touch $@
 ../../samples/wxtest/wxtest.dsw: $(SDEPS) ../../samples/wxtest/wxtest.bkl

-       $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/wxtest/wxtest.bkl
+       touch $@
+
+
+../../utils/HelpGen/Makefile.in: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../utils/HelpGen/helpgen.bkl
+       touch $@
+../../utils/HelpGen/makefile.bcc: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../utils/HelpGen/helpgen.bkl
+       touch $@
+../../utils/HelpGen/makefile.vc: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../utils/HelpGen/helpgen.bkl
+       touch $@
+../../utils/HelpGen/makefile.gcc: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../utils/HelpGen/helpgen.bkl
+       touch $@
+../../utils/HelpGen/makefile.wat: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../utils/HelpGen/helpgen.bkl
+       touch $@
+../../utils/HelpGen/helpgen.dsw: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../utils/HelpGen/helpgen.bkl

        touch $@
 
 
 ../../Makefile.in: $(MDEPS) wx.bkl
        $(BAKEFILE) -fautoconf -o$@  wx.bkl
        touch $@
        touch $@
 
 
 ../../Makefile.in: $(MDEPS) wx.bkl
        $(BAKEFILE) -fautoconf -o$@  wx.bkl
        touch $@

-../makefile.bcc: $(MDEPS) wx.bkl
+../msw/makefile.bcc: $(MDEPS) wx.bkl

        $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=config.bcc wx.bkl
        touch $@
        $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=config.bcc wx.bkl
        touch $@

-../makefile.vc: $(MDEPS) wx.bkl
+../msw/makefile.vc: $(MDEPS) wx.bkl

        $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=config.vc wx.bkl
        touch $@
        $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=config.vc wx.bkl
        touch $@

-../makefile.gcc: $(MDEPS) wx.bkl
+../msw/makefile.gcc: $(MDEPS) wx.bkl

        $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=config.gcc wx.bkl
        touch $@
        $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=config.gcc wx.bkl
        touch $@

-../makefile.wat: $(MDEPS) wx.bkl
+../msw/makefile.wat: $(MDEPS) wx.bkl

        $(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=config.wat wx.bkl
        touch $@
        $(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=config.wat wx.bkl
        touch $@

-../wx.dsw: $(MDEPS) wx.bkl
+../msw/wx.dsw: $(MDEPS) wx.bkl

        $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) wx.bkl
        touch $@
        $(BAKEFILE) -fmsvc6prj -o$@  $(DSWFLAGS) wx.bkl
        touch $@